[Cmake-commits] CMake branch, master, updated. v3.10.0-565-ge1a09cf
Kitware Robot
kwrobot at kitware.com
Thu Dec 7 08:15:17 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc (commit)
via 79fde6a324545f6461020c957af1f63e5f2a72da (commit)
via 3de52db69cc0c9568067c02492eddf5396147e0c (commit)
via ffc9c89dae80372f7504c4b30292e6f5da514c2a (commit)
via 9accb48d175d5163266cc7792c2dbb5ca5fed0d2 (commit)
via ea63c522ef7561365c90e1e1f7c7e37403bac53b (commit)
via afae027d6398462906e762da29f306f41d21c6ee (commit)
via b8b87489770bd29ffcfc4b2faec3f98bd089f3ff (commit)
via 05f86af716e00b58b5103b231a22515edcc95321 (commit)
via b7100756d739e1a46820b700607e738f17985e30 (commit)
via 976370d134a2d7b22b6f43f6031b0ee850a01d9d (commit)
via 8b2736c71ca6eb8e62a69f57ad07e4e19a95c936 (commit)
via f313541adb677f754953d1598d3e8b234ad975b2 (commit)
via 935848a8a7164631b9410a0e6f7c5574b01bb85c (commit)
via 29731d89192681cbc4bf87d7947a877aa0fb27aa (commit)
via f92304c789336f1d5e01a596ea024525c1a2b8f7 (commit)
via e99e39829ba36dbfad189a94062363343d7d3d8b (commit)
from f5e48edaae37fbf9afa668671b3a8d3e5537321b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc
commit e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc
Merge: 79fde6a b8b8748
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 13:14:27 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 7 08:14:34 2017 -0500
Merge topic 'externalproject_download_dir'
b8b87489 ExternalProject: Support substituting <DOWNLOAD_DIR>
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1537
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79fde6a324545f6461020c957af1f63e5f2a72da
commit 79fde6a324545f6461020c957af1f63e5f2a72da
Merge: 3de52db f313541
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 13:13:28 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 7 08:13:37 2017 -0500
Merge topic 'FindOpenCL-amd-sdk'
f313541a FindOpenCL: Add support for AMD OpenCL SDK Light
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1562
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3de52db69cc0c9568067c02492eddf5396147e0c
commit 3de52db69cc0c9568067c02492eddf5396147e0c
Merge: ffc9c89 f92304c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 13:11:51 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 7 08:11:56 2017 -0500
Merge topic 'splitRCPatchComponent'
f92304c7 CMakeVersion RC file: Split patch into 2 components
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1552
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffc9c89dae80372f7504c4b30292e6f5da514c2a
commit ffc9c89dae80372f7504c4b30292e6f5da514c2a
Merge: 9accb48 afae027
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 08:09:37 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 7 08:09:37 2017 -0500
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9accb48d175d5163266cc7792c2dbb5ca5fed0d2
commit 9accb48d175d5163266cc7792c2dbb5ca5fed0d2
Merge: ea63c52 b710075
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 13:08:50 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 7 08:08:59 2017 -0500
Merge topic 'revert-server-target-backtraces'
b7100756 Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces
976370d1 server: drop "ctestInfo" backtrace information
8b2736c7 server: Revert "Report backtraces in codemodel response"
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1564
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea63c522ef7561365c90e1e1f7c7e37403bac53b
commit ea63c522ef7561365c90e1e1f7c7e37403bac53b
Merge: f5e48ed 935848a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 7 13:06:16 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 7 08:06:27 2017 -0500
Merge topic 'gtest-discovery-timeout'
935848a8 GoogleTest: Add test for missing test executable
29731d89 GoogleTest: Add timeout to discovery
e99e3982 GoogleTest: Improve gtest_discover_tests messages
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1534
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8b87489770bd29ffcfc4b2faec3f98bd089f3ff
commit b8b87489770bd29ffcfc4b2faec3f98bd089f3ff
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Thu Nov 30 08:32:26 2017 +1100
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Thu Dec 7 07:22:02 2017 +1100
ExternalProject: Support substituting <DOWNLOAD_DIR>
diff --git a/Help/release/dev/ExternalProject-DOWNLOAD_DIR.rst b/Help/release/dev/ExternalProject-DOWNLOAD_DIR.rst
new file mode 100644
index 0000000..823a14b
--- /dev/null
+++ b/Help/release/dev/ExternalProject-DOWNLOAD_DIR.rst
@@ -0,0 +1,5 @@
+ExternalProject
+---------------
+
+* The :module:`ExternalProject` module learnt to substitute ``<DOWNLOAD_DIR>``
+ in comments, commands, working directory and byproducts.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 67aac4f..d284e27 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -714,8 +714,9 @@ control needed to implement such step-level capabilities.
The command line, comment, working directory and byproducts of every
standard and custom step are processed to replace the tokens
``<SOURCE_DIR>``, ``<SOURCE_SUBDIR>``, ``<BINARY_DIR>``, ``<INSTALL_DIR>``
- and ``<TMP_DIR>`` with their corresponding property values defined in the
- original call to :command:`ExternalProject_Add`.
+ ``<TMP_DIR>``, ``<DOWNLOAD_DIR>`` and ``<DOWNLOADED_FILE>`` with their
+ corresponding property values defined in the original call to
+ :command:`ExternalProject_Add`.
.. command:: ExternalProject_Add_StepTargets
@@ -1665,7 +1666,7 @@ macro(_ep_replace_location_tags target_name)
set(vars ${ARGN})
foreach(var ${vars})
if(${var})
- foreach(dir SOURCE_DIR SOURCE_SUBDIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOADED_FILE)
+ foreach(dir SOURCE_DIR SOURCE_SUBDIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOAD_DIR DOWNLOADED_FILE)
get_property(val TARGET ${target_name} PROPERTY _EP_${dir})
string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}")
endforeach()
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
index 994e2aa..09607f6 100644
--- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
@@ -15,10 +15,31 @@ run_cmake(UsesTerminal)
# Run both cmake and build steps. We always do a clean before the
# build to ensure that the download step re-runs each time.
-set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/MultiCommand-build)
-set(RunCMake_TEST_NO_CLEAN 1)
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
-file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
-run_cmake(MultiCommand)
-run_cmake_command(MultiCommand-clean ${CMAKE_COMMAND} --build . --target clean)
-run_cmake_command(MultiCommand-build ${CMAKE_COMMAND} --build .)
+function(__ep_test_with_build testName)
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${testName}-build)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ run_cmake(${testName})
+ run_cmake_command(${testName}-clean ${CMAKE_COMMAND} --build . --target clean)
+ run_cmake_command(${testName}-build ${CMAKE_COMMAND} --build .)
+endfunction()
+
+__ep_test_with_build(MultiCommand)
+
+# We can't test the substitution when using the old MSYS due to
+# make/sh mangling the paths (substitution is performed correctly,
+# but the mangling means we can't reliably test the output).
+# There is no such issue when using the newer MSYS though. Therefore,
+# we need to bypass the substitution test if using old MSYS.
+# See merge request 1537 for discussion.
+set(doSubstitutionTest YES)
+if(RunCMake_GENERATOR STREQUAL "MSYS Makefiles")
+ execute_process(COMMAND uname OUTPUT_VARIABLE uname)
+ if(uname MATCHES "^MINGW32_NT")
+ set(doSubstitutionTest NO)
+ endif()
+endif()
+if(doSubstitutionTest)
+ __ep_test_with_build(Substitutions)
+endif()
diff --git a/Tests/RunCMake/ExternalProject/Substitutions-build-stdout.txt b/Tests/RunCMake/ExternalProject/Substitutions-build-stdout.txt
new file mode 100644
index 0000000..d6a823a
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Substitutions-build-stdout.txt
@@ -0,0 +1,7 @@
+.*Download dir = .*/xxxx_dwn
+.*Download file = .*/zzzz_tmp.txt
+.*Source dir = .*/xxxx_src
+.*Source subdir = /yyyy_subdir
+.*Binary dir = .*/xxxx_bin
+.*Install dir = .*/xxxx_install
+.*Tmp dir = .*/xxxx_tmp
diff --git a/Tests/RunCMake/ExternalProject/Substitutions.cmake b/Tests/RunCMake/ExternalProject/Substitutions.cmake
new file mode 100644
index 0000000..db79491
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Substitutions.cmake
@@ -0,0 +1,25 @@
+include(ExternalProject)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zzzz_tmp.txt "Dummy file")
+file(MD5 ${CMAKE_CURRENT_BINARY_DIR}/zzzz_tmp.txt md5hash)
+ExternalProject_Add(Subst
+ URL file://${CMAKE_CURRENT_BINARY_DIR}/zzzz_tmp.txt
+ URL_HASH MD5=${md5hash}
+ DOWNLOAD_NO_EXTRACT ON
+ DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/xxxx_dwn
+ SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/xxxx_src
+ SOURCE_SUBDIR yyyy_subdir
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/xxxx_bin
+ INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xxxx_install
+ TMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/xxxx_tmp
+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "Download dir = <DOWNLOAD_DIR>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Download file = <DOWNLOADED_FILE>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Source dir = <SOURCE_DIR>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Source subdir = <SOURCE_SUBDIR>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Binary dir = <BINARY_DIR>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Install dir = <INSTALL_DIR>"
+ COMMAND ${CMAKE_COMMAND} -E echo "Tmp dir = <TMP_DIR>"
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
+ TEST_COMMAND ""
+)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7100756d739e1a46820b700607e738f17985e30
commit b7100756d739e1a46820b700607e738f17985e30
Merge: 976370d 8b2736c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 6 11:49:52 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 6 11:49:52 2017 -0500
Merge branch 'backport-revert-server-target-backtraces' into revert-server-target-backtraces
diff --cc Source/cmServerDictionary.h
index 62dee11,e6a7ae6..685542c
--- a/Source/cmServerDictionary.h
+++ b/Source/cmServerDictionary.h
@@@ -89,19 -88,7 +89,14 @@@ static const std::string kWARN_UNUSED_C
static const std::string kWARN_UNUSED_KEY = "warnUnused";
static const std::string kWATCHED_DIRECTORIES_KEY = "watchedDirectories";
static const std::string kWATCHED_FILES_KEY = "watchedFiles";
+static const std::string kHAS_INSTALL_RULE = "hasInstallRule";
+static const std::string kINSTALL_PATHS = "installPaths";
+static const std::string kCTEST_NAME = "ctestName";
+static const std::string kCTEST_COMMAND = "ctestCommand";
+static const std::string kCTEST_INFO = "ctestInfo";
+static const std::string kMINIMUM_CMAKE_VERSION = "minimumCMakeVersion";
+static const std::string kIS_GENERATOR_PROVIDED_KEY = "isGeneratorProvided";
- static const std::string kTARGET_CROSS_REFERENCES_KEY = "crossReferences";
- static const std::string kLINE_NUMBER_KEY = "line";
- static const std::string kBACKTRACE_KEY = "backtrace";
- static const std::string kRELATED_STATEMENTS_KEY = "relatedStatements";
-
static const std::string kSTART_MAGIC = "[== \"CMake Server\" ==[";
static const std::string kEND_MAGIC = "]== \"CMake Server\" ==]";
diff --cc Source/cmServerProtocol.cxx
index b9b06db,13b18c2..ad66467
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@@ -8,13 -8,9 +8,12 @@@
#include "cmGeneratorExpression.h"
#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
+#include "cmInstallGenerator.h"
+#include "cmInstallTargetGenerator.h"
#include "cmLinkLineComputer.h"
- #include "cmListFileCache.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmProperty.h"
#include "cmServer.h"
#include "cmServerDictionary.h"
#include "cmSourceFile.h"
@@@ -744,128 -730,6 +743,97 @@@ static Json::Value DumpSourceFilesList
return result;
}
- static Json::Value DumpBacktrace(const cmListFileBacktrace& backtrace)
- {
- Json::Value result = Json::arrayValue;
-
- cmListFileBacktrace backtraceCopy = backtrace;
- while (!backtraceCopy.Top().FilePath.empty()) {
- Json::Value entry = Json::objectValue;
- entry[kPATH_KEY] = backtraceCopy.Top().FilePath;
- if (backtraceCopy.Top().Line) {
- entry[kLINE_NUMBER_KEY] = static_cast<int>(backtraceCopy.Top().Line);
- }
- if (!backtraceCopy.Top().Name.empty()) {
- entry[kNAME_KEY] = backtraceCopy.Top().Name;
- }
- result.append(entry);
- backtraceCopy = backtraceCopy.Pop();
- }
- return result;
- }
-
- static void DumpBacktraceRange(Json::Value& result, const std::string& type,
- cmBacktraceRange range)
- {
- for (auto const& bt : range) {
- Json::Value obj = Json::objectValue;
- obj[kTYPE_KEY] = type;
- obj[kBACKTRACE_KEY] = DumpBacktrace(bt);
- result.append(obj);
- }
- }
-
+static Json::Value DumpCTestInfo(cmTest* testInfo)
+{
+ Json::Value result = Json::objectValue;
+ result[kCTEST_NAME] = testInfo->GetName();
+
+ // Concat command entries together. After the first should be the arguments
+ // for the command
+ std::string command;
+ for (auto const& cmd : testInfo->GetCommand()) {
+ command.append(cmd);
+ command.append(" ");
+ }
+ result[kCTEST_COMMAND] = command;
+
+ // Build up the list of properties that may have been specified
+ Json::Value properties = Json::arrayValue;
+ for (auto& prop : testInfo->GetProperties()) {
+ Json::Value entry = Json::objectValue;
+ entry[kKEY_KEY] = prop.first;
+ entry[kVALUE_KEY] = prop.second.GetValue();
+ properties.append(entry);
+ }
+ result[kPROPERTIES_KEY] = properties;
+
+ return result;
+}
+
+static void DumpMakefileTests(cmMakefile* mf, const std::string& config,
+ Json::Value* result)
+{
+ std::vector<cmTest*> tests;
+ mf->GetTests(config, tests);
+ for (auto test : tests) {
+ Json::Value tmp = DumpCTestInfo(test);
+ if (!tmp.isNull()) {
+ result->append(tmp);
+ }
+ }
+}
+
+static Json::Value DumpCTestProjectList(const cmake* cm,
+ std::string const& config)
+{
+ Json::Value result = Json::arrayValue;
+
+ auto globalGen = cm->GetGlobalGenerator();
+
+ for (const auto& projectIt : globalGen->GetProjectMap()) {
+ Json::Value pObj = Json::objectValue;
+ pObj[kNAME_KEY] = projectIt.first;
+
+ Json::Value tests = Json::arrayValue;
+
+ // Gather tests for every generator
+ for (const auto& lg : projectIt.second) {
+ // Make sure they're generated.
+ lg->GenerateTestFiles();
+ cmMakefile* mf = lg->GetMakefile();
+ DumpMakefileTests(mf, config, &tests);
+ }
+
+ pObj[kCTEST_INFO] = tests;
+
+ result.append(pObj);
+ }
+
+ return result;
+}
+
+static Json::Value DumpCTestConfiguration(const cmake* cm,
+ const std::string& config)
+{
+ Json::Value result = Json::objectValue;
+ result[kNAME_KEY] = config;
+
+ result[kPROJECTS_KEY] = DumpCTestProjectList(cm, config);
+
+ return result;
+}
+
+static Json::Value DumpCTestConfigurationsList(const cmake* cm)
+{
+ Json::Value result = Json::arrayValue;
+
+ for (const std::string& c : getConfigurations(cm)) {
+ result.append(DumpCTestConfiguration(cm, c));
+ }
+
+ return result;
+}
+
static Json::Value DumpTarget(cmGeneratorTarget* target,
const std::string& config)
{
@@@ -902,50 -764,6 +870,34 @@@
result[kFULL_NAME_KEY] = target->GetFullName(config);
+ if (target->Target->GetHaveInstallRule()) {
+ result[kHAS_INSTALL_RULE] = true;
+
+ Json::Value installPaths = Json::arrayValue;
+ auto targetGenerators = target->Makefile->GetInstallGenerators();
+ for (auto installGenerator : targetGenerators) {
+ auto installTargetGenerator =
+ dynamic_cast<cmInstallTargetGenerator*>(installGenerator);
+ if (installTargetGenerator != nullptr &&
+ installTargetGenerator->GetTarget()->Target == target->Target) {
+ auto dest = installTargetGenerator->GetDestination(config);
+
+ std::string installPath;
+ if (!dest.empty() && cmSystemTools::FileIsFullPath(dest.c_str())) {
+ installPath = dest;
+ } else {
+ std::string installPrefix =
+ target->Makefile->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
+ installPath = installPrefix + '/' + dest;
+ }
+
+ installPaths.append(installPath);
+ }
+ }
+
+ result[kINSTALL_PATHS] = installPaths;
+ }
+
- Json::Value crossRefs = Json::objectValue;
- crossRefs[kBACKTRACE_KEY] = DumpBacktrace(target->Target->GetBacktrace());
-
- Json::Value statements = Json::arrayValue;
- DumpBacktraceRange(statements, "target_compile_definitions",
- target->Target->GetCompileDefinitionsBacktraces());
- DumpBacktraceRange(statements, "target_include_directories",
- target->Target->GetIncludeDirectoriesBacktraces());
- DumpBacktraceRange(statements, "target_compile_options",
- target->Target->GetCompileOptionsBacktraces());
- DumpBacktraceRange(statements, "target_link_libraries",
- target->Target->GetLinkImplementationBacktraces());
-
- crossRefs[kRELATED_STATEMENTS_KEY] = std::move(statements);
- result[kTARGET_CROSS_REFERENCES_KEY] = std::move(crossRefs);
-
if (target->HaveWellDefinedOutputFiles()) {
Json::Value artifacts = Json::arrayValue;
artifacts.append(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=976370d134a2d7b22b6f43f6031b0ee850a01d9d
commit 976370d134a2d7b22b6f43f6031b0ee850a01d9d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 6 11:45:51 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 6 11:45:51 2017 -0500
server: drop "ctestInfo" backtrace information
Backtrace information was included by commit 35a52bd1b4 (server: add
"ctestInfo" request to get test info, 2017-10-25) to match that already
provided for targets. However, the backtrace representation uses too
much memory and needs to be dropped. Remove it from test information.
Issue: #17502
diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index c2aef99..7232174 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -669,17 +669,6 @@ Each test object can have the following keys:
contains the test command.
"properties"
contains a list of test property objects.
-"backtrace"
- contains a list of backtrace objects that specify where the test was defined.
-
-Each backtrace object can have the following keys:
-
-"path"
- contains the full path to the file containing the statement.
-"line"
- contains the line number in the file where the statement was defined.
-"name"
- contains the name of the statement that added the test.
Each test property object can have the following keys:
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index da354bd..b9b06db 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -799,9 +799,6 @@ static Json::Value DumpCTestInfo(cmTest* testInfo)
}
result[kPROPERTIES_KEY] = properties;
- // Need backtrace to figure out where this test was originally added
- result[kBACKTRACE_KEY] = DumpBacktrace(testInfo->GetBacktrace());
-
return result;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f313541adb677f754953d1598d3e8b234ad975b2
commit f313541adb677f754953d1598d3e8b234ad975b2
Author: Harry Mallon <hjmallon at gmail.com>
AuthorDate: Wed Dec 6 14:31:52 2017 +0000
Commit: Harry Mallon <hjmallon at gmail.com>
CommitDate: Wed Dec 6 15:03:34 2017 +0000
FindOpenCL: Add support for AMD OpenCL SDK Light
diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index 5d79110..297a5fb 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -76,6 +76,7 @@ find_path(OpenCL_INCLUDE_DIR
ENV NVSDKCOMPUTE_ROOT
ENV CUDA_PATH
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
include
OpenCL/common/inc
@@ -94,6 +95,7 @@ if(WIN32)
ENV CUDA_PATH
ENV NVSDKCOMPUTE_ROOT
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
"AMD APP/lib/x86"
lib/x86
@@ -109,6 +111,7 @@ if(WIN32)
ENV CUDA_PATH
ENV NVSDKCOMPUTE_ROOT
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
"AMD APP/lib/x86_64"
lib/x86_64
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f92304c789336f1d5e01a596ea024525c1a2b8f7
commit f92304c789336f1d5e01a596ea024525c1a2b8f7
Author: Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Fri Dec 1 11:44:00 2017 -0800
Commit: Justin Goshi <jgoshi at microsoft.com>
CommitDate: Mon Dec 4 10:49:39 2017 -0800
CMakeVersion RC file: Split patch into 2 components
The binary file version has 4 16-bit components. In cases where the
patch component is too large (ex: represents a build date yyyymmdd) we
split it into two parts.
diff --git a/Source/CMakeVersion.rc.in b/Source/CMakeVersion.rc.in
index 60e14e5..22b4a36 100644
--- a/Source/CMakeVersion.rc.in
+++ b/Source/CMakeVersion.rc.in
@@ -1,11 +1,11 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
-#define VER_FILEVERSION @CMake_VERSION_MAJOR@, at CMake_VERSION_MINOR@, at CMake_VERSION_PATCH@
-#define VER_FILEVERSION_STR "@CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR at .@CMake_VERSION_PATCH@\0"
+#define VER_FILEVERSION @CMake_RCVERSION@
+#define VER_FILEVERSION_STR "@CMake_RCVERSION_STR@\0"
-#define VER_PRODUCTVERSION @CMake_VERSION_MAJOR@, at CMake_VERSION_MINOR@, at CMake_VERSION_PATCH@
-#define VER_PRODUCTVERSION_STR "@CMake_VERSION@\0"
+#define VER_PRODUCTVERSION @CMake_RCVERSION@
+#define VER_PRODUCTVERSION_STR "@CMake_RCVERSION_STR@\0"
/* Version-information resource identifier. */
#define VS_VERSION_INFO 1
diff --git a/Source/CMakeVersionCompute.cmake b/Source/CMakeVersionCompute.cmake
index d9218d7..79264ed 100644
--- a/Source/CMakeVersionCompute.cmake
+++ b/Source/CMakeVersionCompute.cmake
@@ -27,3 +27,13 @@ endif()
if(CMake_VERSION_IS_DIRTY)
set(CMake_VERSION ${CMake_VERSION}-dirty)
endif()
+
+# Compute the binary version that appears in the RC file. Version
+# components in the RC file are 16-bit integers so we may have to
+# split the patch component.
+if(CMake_VERSION_PATCH MATCHES "^([0-9]+)([0-9][0-9][0-9][0-9])$")
+ set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMAKE_MATCH_1},${CMAKE_MATCH_2})
+else()
+ set(CMake_RCVERSION ${CMake_VERSION_MAJOR},${CMake_VERSION_MINOR},${CMake_VERSION_PATCH})
+endif()
+set(CMake_RCVERSION_STR ${CMake_VERSION})
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-server.7.rst | 53 +-------------------
Help/release/3.10.rst | 12 +++++
Help/release/dev/ExternalProject-DOWNLOAD_DIR.rst | 5 ++
Modules/ExternalProject.cmake | 7 +--
Modules/FindOpenCL.cmake | 3 ++
Modules/GoogleTest.cmake | 14 +++++-
Modules/GoogleTestAddTests.cmake | 11 ++--
Source/CMakeVersion.rc.in | 8 +--
Source/CMakeVersionCompute.cmake | 10 ++++
Source/cmServerDictionary.h | 5 --
Source/cmServerProtocol.cxx | 51 -------------------
Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 35 ++++++++++---
.../ExternalProject/Substitutions-build-stdout.txt | 7 +++
Tests/RunCMake/ExternalProject/Substitutions.cmake | 25 +++++++++
.../GoogleTest-test-missing-result.txt} | 0
.../GoogleTest/GoogleTest-test-missing-stderr.txt | 2 +
.../GoogleTest-timeout-result.txt} | 0
.../GoogleTest/GoogleTest-timeout-stdout.txt | 7 +++
Tests/RunCMake/GoogleTest/GoogleTest.cmake | 6 +++
Tests/RunCMake/GoogleTest/RunCMakeTest.cmake | 21 ++++++++
.../GoogleTest/timeout_test.cpp} | 7 ++-
21 files changed, 159 insertions(+), 130 deletions(-)
create mode 100644 Help/release/dev/ExternalProject-DOWNLOAD_DIR.rst
create mode 100644 Tests/RunCMake/ExternalProject/Substitutions-build-stdout.txt
create mode 100644 Tests/RunCMake/ExternalProject/Substitutions.cmake
copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => GoogleTest/GoogleTest-test-missing-result.txt} (100%)
create mode 100644 Tests/RunCMake/GoogleTest/GoogleTest-test-missing-stderr.txt
copy Tests/RunCMake/{CMP0060/CMP0060-OLD-Build-result.txt => GoogleTest/GoogleTest-timeout-result.txt} (100%)
create mode 100644 Tests/RunCMake/GoogleTest/GoogleTest-timeout-stdout.txt
copy Tests/{CTestTestCostSerial/sleep.c => RunCMake/GoogleTest/timeout_test.cpp} (59%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list