Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-29267] CMAKE_BUILD_TOOL is deprecated in cmake version
3.0
  • Loading branch information
15knots committed Jul 11, 2015
1 parent a1cdc53 commit 2945648
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 115 deletions.
110 changes: 0 additions & 110 deletions src/main/java/de/marw/cmake/cmakecache/SimpleCMakeCacheTxt.java

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/cmake/BuildToolEntryParser.java
Expand Up @@ -29,7 +29,7 @@
import de.marw.cmake.cmakecache.SimpleCMakeCacheEntry;

/**
* Gets the value of the {@code "CMAKE_BUILD_TOOL"} entry from a cmake cache
* Gets the value of the {@code "CMAKE_MAKE_PROGRAM"} entry from a cmake cache
* file.
*
* @author Martin Weber
Expand All @@ -39,7 +39,7 @@ public class BuildToolEntryParser implements FilePath.FileCallable<String> {
private static final long serialVersionUID = 1L;

/**
* Parses the cach file and returns value of the {@code "CMAKE_BUILD_TOOL"}
* Parses the cache file and returns value of the {@code "CMAKE_MAKE_PROGRAM"}
* entry.
*
* @return the entry value or {@code null} if the file could not be parsed
Expand All @@ -57,7 +57,7 @@ public String invoke(File cmakeCacheFile, VirtualChannel channel)

@Override
public boolean accept(String key) {
return "CMAKE_BUILD_TOOL".equals(key);
return "CMAKE_MAKE_PROGRAM".equals(key);
}
}, result, null);
if (result.size() > 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/cmake/CmakeBuilder.java
Expand Up @@ -245,7 +245,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher,
FilePath cacheFile = theBuildDir.child("CMakeCache.txt");
String buildTool = cacheFile.act(new BuildToolEntryParser());
if (buildTool == null) {
listener.error("Failed to get CMAKE_BUILD_TOOL value from "
listener.error("Failed to get CMAKE_MAKE_PROGRAM value from "
+ cacheFile.getRemote());
return false; // abort build
}
Expand Down
Expand Up @@ -19,7 +19,7 @@
The build tool chosen by CMake &mdash; corresponding to the generator &mdash;
is exposed in the
<code><strong>CMAKE_BUILD_TOOL</strong></code> build environment variable.
Subsequent build steps may use <code>$CMAKE_BUILD_TOOL</code>
Subsequent build steps may use <code>$CMAKE_BUILD_TOOL}</code>
to execute the generated scripts.<br>
Its actual value is retrieved from the generated CMake cache file
(<code>CMakeCache.txt</code>). Usually that value is something like
Expand Down

0 comments on commit 2945648

Please sign in to comment.