[Cmake-commits] CMake branch, master, updated. v3.7.1-958-g3e5fbbd
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 3e5fbbd6cdc472cdf7823cf81c0e527c79653188 (commit) from 914728f8d724e834a402619d05309ad8154ba59d (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=3e5fbbd6cdc472cdf7823cf81c0e527c79653188 commit 3e5fbbd6cdc472cdf7823cf81c0e527c79653188 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Wed Jan 11 00:01:06 2017 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Jan 11 00:01:06 2017 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7a2482a..a5a07dc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20170110) +set(CMake_VERSION_PATCH 20170111) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-2030-g55f86ce
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, next has been updated via 55f86ceb1f2e5e925a678e9decf181141bb301dc (commit) via ff1602f864a282a7eece0dce6612e33a6a37b265 (commit) from 19e5a8a29816e5f9a61b53a444a127b87c55c12e (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=55f86ceb1f2e5e925a678e9decf181141bb301dc commit 55f86ceb1f2e5e925a678e9decf181141bb301dc Merge: 19e5a8a ff1602f Author: Brad KingAuthorDate: Tue Jan 10 16:47:50 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 16:47:50 2017 -0500 Merge topic 'vs15-detect-from-installer' into next ff1602f8 VS: Port Visual Studio Setup third-party header to older VS versions https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff1602f864a282a7eece0dce6612e33a6a37b265 commit ff1602f864a282a7eece0dce6612e33a6a37b265 Author: Brad King AuthorDate: Tue Jan 10 16:45:12 2017 -0500 Commit: Brad King CommitDate: Tue Jan 10 16:47:13 2017 -0500 VS: Port Visual Studio Setup third-party header to older VS versions diff --git a/Utilities/cmvssetup/Setup.Configuration.h b/Utilities/cmvssetup/Setup.Configuration.h index cc01d27..36b8747 100644 --- a/Utilities/cmvssetup/Setup.Configuration.h +++ b/Utilities/cmvssetup/Setup.Configuration.h @@ -23,6 +23,16 @@ #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) +#ifndef _Outptr_result_maybenull_ +#define _Outptr_result_maybenull_ +#endif +#ifndef _Out_writes_to_ +#define _Out_writes_to_(x,y) +#endif +#ifndef _Reserved_ +#define _Reserved_ +#endif + // Enumerations // /// --- Summary of changes: Utilities/cmvssetup/Setup.Configuration.h | 10 ++ 1 file changed, 10 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-2028-g19e5a8a
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, next has been updated via 19e5a8a29816e5f9a61b53a444a127b87c55c12e (commit) via e537bd91129fc1616f787b64024f1b08d0f7ae45 (commit) via 0a2e588585a951b1f26cfa9094e0709f1d026b1e (commit) via cdacfbd255dcf640be7dd4971a1be616d015b3fd (commit) via cf590c1236e40eaff9fe76ec918fad33df4f6be4 (commit) from 25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b (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=19e5a8a29816e5f9a61b53a444a127b87c55c12e commit 19e5a8a29816e5f9a61b53a444a127b87c55c12e Merge: 25b5e76 e537bd9 Author: Brad KingAuthorDate: Tue Jan 10 15:37:11 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 15:37:11 2017 -0500 Merge topic 'ctest_memcheck-leak_sanitizer' into next e537bd91 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS 0a2e5885 ctest_memcheck: join *SAN_OPTIONS with : cdacfbd2 MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers cf590c12 ctest_memcheck: add support for standalone LeakSanitizer https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e537bd91129fc1616f787b64024f1b08d0f7ae45 commit e537bd91129fc1616f787b64024f1b08d0f7ae45 Author: Jamie Snape AuthorDate: Mon Jan 9 13:43:19 2017 -0500 Commit: Jamie Snape CommitDate: Mon Jan 9 13:43:19 2017 -0500 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst index 60b4a22..3fa5c49 100644 --- a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst +++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst @@ -4,6 +4,11 @@ ctest_memcheck-leak_sanitizer * The :command:`ctest_memcheck` command learned to support ``LeakSanitizer`` independently from ``AddressSanitizer``. +* The :command:`ctest_memcheck` command no longer automatically adds + ``leak_check=1`` to the options used by ``AddressSanitizer``. The default + behavior of ``AddressSanitizer`` is to run `LeakSanitizer` to check leaks + unless ``leak_check=0``. + * The :command:`ctest_memcheck` command learned to read the location of suppressions files for sanitizers from the :variable:`CTEST_MEMORYCHECK_SUPPRESSIONS_FILE` variable. diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index fc07249..4d23e45 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -618,7 +618,6 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() if (this->MemoryTesterStyle == cmCTestMemCheckHandler::ADDRESS_SANITIZER) { envVar = "ASAN_OPTIONS"; -extraOptions += ":detect_leaks=1"; } else if (this->MemoryTesterStyle == cmCTestMemCheckHandler::LEAK_SANITIZER) { envVar = "LSAN_OPTIONS"; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a2e588585a951b1f26cfa9094e0709f1d026b1e commit 0a2e588585a951b1f26cfa9094e0709f1d026b1e Author: Jamie Snape AuthorDate: Mon Jan 9 13:39:08 2017 -0500 Commit: Jamie Snape CommitDate: Mon Jan 9 13:39:08 2017 -0500 ctest_memcheck: join *SAN_OPTIONS with : diff --git a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst index 1348c278a..60b4a22 100644 --- a/Help/release/dev/ctest_memcheck-leak_sanitizer.rst +++ b/Help/release/dev/ctest_memcheck-leak_sanitizer.rst @@ -7,3 +7,8 @@ ctest_memcheck-leak_sanitizer * The :command:`ctest_memcheck` command learned to read the location of suppressions files for sanitizers from the :variable:`CTEST_MEMORYCHECK_SUPPRESSIONS_FILE` variable. + +* The :command:`ctest_memcheck` command was fixed to correctly append extra + sanitizer options read from the + :variable:`CTEST_MEMORYCHECK_SANITIZER_OPTIONS` variable to the environment + variables used internally by the sanitizers. diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 81b73aa..fc07249 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -607,18 +607,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() this->MemoryTesterDynamicOptions.push_back("-E"); this->MemoryTesterDynamicOptions.push_back("env"); std::string envVar; - std::string extraOptions = + std::string extraOptions = ":" +
[Cmake-commits] CMake branch, next, updated. v3.7.1-2023-g25b5e76
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, next has been updated via 25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b (commit) via b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b (commit) via 331eb74b795cae914ec88e58f2c0bec69c17a853 (commit) via cbc07d331d1d5429dc1e0b7c6c7949ff8d9efdf1 (commit) via c17e0a3ad58f06fcb0827910af520405670b3d51 (commit) via 53787bf8de2d3981f650e9036bb89cb6ed884a75 (commit) via 8dbdd3e726ead25c179e6eb4ffab212a1db3aba8 (commit) via 0699760d5c8b644242ddd4ac6d07d8c4c68f2b94 (commit) via a84f0bb726ebcc8e9bf3db0b99e5b6fd8a720045 (commit) via 7b766b83952ec4c431a55d2f6e589a5f806834c9 (commit) via 2964b8cca4155fa318722f6ef17f0d4d56ee2f29 (commit) via d58b6bf31c18cfedd4a2f15e009b8e5cbdc21b6e (commit) via 94c319f93309ff4cddd0280cdcbd48b50492db36 (commit) via 966be439e07131c3ff84175c1a9e3b6336908d8e (commit) via de531432887487943dbe4ae5a1bde762d5582e06 (commit) via d8e45536fb3637454cf17a638dcd9fc236e94660 (commit) via d9313a82906ced0ff3c76828e86d9d7a248a5e49 (commit) via 32d3540e090c4a24d55b99c49c094a9cb574c9b3 (commit) via e7280a7f1743d73cdab41ed709a9e1d0f99b6342 (commit) via 63d3ca4c1cab0c7b9c71d6c051c3b4c053eb7627 (commit) via 6ae19bf32e232beb59a0c427d82c0761e8248ab8 (commit) via 9986da4f0f2f49c0d7d260f9d21deaa906708376 (commit) via d51cc88e844c78c01c1616e6a2fb102c0682dd00 (commit) via cf1d5a9cdba49a2e9f08879d756ae118b22bfc6a (commit) via f962275987e17cf94da663a919f52b6d0c8f44f4 (commit) via c736c41ad192c89e1c74751a8f401c75955f5f3b (commit) via cbd650c2642e40369eaa53d20dafee6cdccae4af (commit) via 0b1527ff3d1781380756ee72a9641b7c5c7c87cc (commit) via 2b9d795e63acf723a6abd79f3195ec70476442a5 (commit) via 2cfcdf757d032cdea8b980792007a6f9d749e6fb (commit) via 2f67aef23d4192fadb222dc79311fb5ffbbc36ce (commit) via 794fdf40a1bc85dded519d7c737f73690e3a6e42 (commit) via a1e49bb155132606ed9f590c0b62e68f2e288d0b (commit) from b526e70725cc58b1bc51c0d5c4f3f9c00a908387 (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=25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b commit 25b5e76e15b3b5fe6e0aacd5345ecd1f3d360e5b Merge: b526e70 b393e63 Author: Brad KingAuthorDate: Tue Jan 10 14:32:45 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 14:32:45 2017 -0500 Merge topic 'Autogen_Simplify' into next b393e63b AUTOGEN: Release notes for SKIP_AUTOX 331eb74b AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test 53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test 8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test 0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification 7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only 2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods 94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC 966be439 AUTOGEN: Generators: Be verbose about skipping files de531432 AUTOGEN: Generators: Remove unused variable d8e45536 AUTOGEN: Initializer: Always remember skipped files d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources ... https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b commit b393e63bc9b98b429dc1bbaf21a4e2d481dfec4b Author: Sebastian Holtermann AuthorDate: Mon Jan 2 18:02:53 2017 +0100 Commit: Sebastian Holtermann CommitDate: Tue Jan 10 12:49:17 2017 +0100 AUTOGEN: Release notes for SKIP_AUTOX diff --git a/Help/release/dev/QtAutogen_Skip.rst b/Help/release/dev/QtAutogen_Skip.rst new file mode 100644 index 000..37f795c --- /dev/null +++ b/Help/release/dev/QtAutogen_Skip.rst @@ -0,0 +1,12 @@ +QtAutogen_Skip +-- + +* The source file properties + :prop_sf:`SKIP_AUTOMOC`, + :prop_sf:`SKIP_AUTOUIC`, + :prop_sf:`SKIP_AUTORCC` and + :prop_sf:`SKIP_AUTOGEN` + allow to exclude files from + :prop_tgt:`AUTOMOC`, + :prop_tgt:`AUTOUIC` and + :prop_tgt:`AUTORCC` processing.
[Cmake-commits] CMake branch, next, updated. v3.7.1-1990-gb526e70
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, next has been updated via b526e70725cc58b1bc51c0d5c4f3f9c00a908387 (commit) via ff91b1514be75dee07e8009a60ad39284e8844b4 (commit) from f1926db39ba43c3ba8d3397425fd93de71d6bbf1 (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=b526e70725cc58b1bc51c0d5c4f3f9c00a908387 commit b526e70725cc58b1bc51c0d5c4f3f9c00a908387 Merge: f1926db ff91b15 Author: Brad KingAuthorDate: Tue Jan 10 14:25:18 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 14:25:18 2017 -0500 Merge topic 'FindBoost-find-default' into next ff91b151 FindBoost: Search official location of prebuilt binaries on Windows https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff91b1514be75dee07e8009a60ad39284e8844b4 commit ff91b1514be75dee07e8009a60ad39284e8844b4 Author: Alex Turbov AuthorDate: Wed Dec 21 16:12:09 2016 +0800 Commit: Brad King CommitDate: Tue Jan 10 14:21:53 2017 -0500 FindBoost: Search official location of prebuilt binaries on Windows Make it possible to find Boost in the default install path (`c:\boost`) of an official prebuilt binaries installation even when `BOOST_ROOT` has not been specified. diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index e6bf3dc..ee5e668 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -877,7 +877,7 @@ endfunction() # This function would append corresponding directories if MSVC is a current compiler, # so having `BOOST_ROOT` would be enough to specify to find everything. # -macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir) +macro(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir) if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_arch_suffix 64) @@ -885,19 +885,19 @@ macro(_Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar base set(_arch_suffix 32) endif() if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-15.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-15.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-14.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-14.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-12.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-12.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-11.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-11.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-10.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-10.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-9.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-9.0) elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14) - list(APPEND ${componentlibvar} ${${basedir}}/lib${_arch_suffix}-msvc-8.0) + list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-8.0) endif() endif() endmacro() @@ -1361,10 +1361,10 @@ foreach(c DEBUG RELEASE) if(BOOST_ROOT) list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${BOOST_ROOT}/lib ${BOOST_ROOT}/stage/lib) - _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} BOOST_ROOT) + _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${BOOST_ROOT}") elseif(_ENV_BOOST_ROOT) list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} ${_ENV_BOOST_ROOT}/lib ${_ENV_BOOST_ROOT}/stage/lib) - _Boost_UPDATE_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} _ENV_BOOST_ROOT) + _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${_ENV_BOOST_ROOT}") endif() list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} @@ -1372,6 +1372,7 @@ foreach(c DEBUG RELEASE) ${Boost_INCLUDE_DIR}/../lib
[Cmake-commits] CMake branch, next, updated. v3.7.1-1988-gf1926db
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, next has been updated via f1926db39ba43c3ba8d3397425fd93de71d6bbf1 (commit) via 2ad86c4232bec1eb5205f67a350084cc77018f27 (commit) from 202c24a3e137558723f8d781ccbdd3665daa8b2e (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=f1926db39ba43c3ba8d3397425fd93de71d6bbf1 commit f1926db39ba43c3ba8d3397425fd93de71d6bbf1 Merge: 202c24a 2ad86c4 Author: Brad KingAuthorDate: Tue Jan 10 14:16:52 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 14:16:52 2017 -0500 Merge topic 'asan_overriding_user_options' into next 2ad86c42 Revert "ctest_memcheck: Append sanitizers user options to allow overriding" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad86c4232bec1eb5205f67a350084cc77018f27 commit 2ad86c4232bec1eb5205f67a350084cc77018f27 Author: Brad King AuthorDate: Tue Jan 10 14:16:45 2017 -0500 Commit: Brad King CommitDate: Tue Jan 10 14:16:45 2017 -0500 Revert "ctest_memcheck: Append sanitizers user options to allow overriding" This reverts commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba. diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 8686d77..2c31f60 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -602,7 +602,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() if (this->MemoryTesterStyle == cmCTestMemCheckHandler::ADDRESS_SANITIZER) { envVar = "ASAN_OPTIONS"; -extraOptions = "detect_leaks=1 " + extraOptions; +extraOptions += " detect_leaks=1"; } else if (this->MemoryTesterStyle == cmCTestMemCheckHandler::THREAD_SANITIZER) { envVar = "TSAN_OPTIONS"; --- Summary of changes: Source/CTest/cmCTestMemCheckHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1986-g202c24a
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, next has been updated via 202c24a3e137558723f8d781ccbdd3665daa8b2e (commit) via 524f5ee186f95a0dc0dc449e437910a72b175893 (commit) from b4636f780f83e0da8431a5cfd6725878baf65aab (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=202c24a3e137558723f8d781ccbdd3665daa8b2e commit 202c24a3e137558723f8d781ccbdd3665daa8b2e Merge: b4636f7 524f5ee Author: Brad KingAuthorDate: Tue Jan 10 14:13:34 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 14:13:34 2017 -0500 Merge topic 'android_clang_asm' into next 524f5ee1 Android: Set compiler target platform when compiling ASM with Clang https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524f5ee186f95a0dc0dc449e437910a72b175893 commit 524f5ee186f95a0dc0dc449e437910a72b175893 Author: Florent Castelli AuthorDate: Fri Jan 6 23:33:37 2017 +0100 Commit: Brad King CommitDate: Tue Jan 10 14:12:46 2017 -0500 Android: Set compiler target platform when compiling ASM with Clang Closes: #16535 diff --git a/Modules/Platform/Android-Clang-ASM.cmake b/Modules/Platform/Android-Clang-ASM.cmake new file mode 100644 index 000..6448da6 --- /dev/null +++ b/Modules/Platform/Android-Clang-ASM.cmake @@ -0,0 +1,2 @@ +include(Platform/Android-Clang) +__android_compiler_clang(ASM) diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index f0cf4a5..f739ab1 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -35,7 +35,9 @@ include(Platform/Android-Common) include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang) macro(__android_compiler_clang lang) - __android_compiler_common(${lang}) + if(NOT "x${lang}" STREQUAL "xASM") +__android_compiler_common(${lang}) + endif() if(NOT CMAKE_${lang}_COMPILER_TARGET) set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}") endif() --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1984-gb4636f7
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, next has been updated via b4636f780f83e0da8431a5cfd6725878baf65aab (commit) via 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba (commit) from deefc1319b83543ff4ffe65feded4ddc290b6a54 (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=b4636f780f83e0da8431a5cfd6725878baf65aab commit b4636f780f83e0da8431a5cfd6725878baf65aab Merge: deefc13 7a9b109 Author: Brad KingAuthorDate: Tue Jan 10 13:59:50 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:59:50 2017 -0500 Merge topic 'asan_overriding_user_options' into next 7a9b109e ctest_memcheck: Append sanitizers user options to allow overriding https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9b109e598b5beea2f5d370a8ed60bf28ec29ba commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba Author: Sylvain Joubert AuthorDate: Mon Dec 19 11:59:45 2016 +0100 Commit: Sylvain Joubert CommitDate: Mon Dec 19 11:59:45 2016 +0100 ctest_memcheck: Append sanitizers user options to allow overriding diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 2c31f60..8686d77 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -602,7 +602,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() if (this->MemoryTesterStyle == cmCTestMemCheckHandler::ADDRESS_SANITIZER) { envVar = "ASAN_OPTIONS"; -extraOptions += " detect_leaks=1"; +extraOptions = "detect_leaks=1 " + extraOptions; } else if (this->MemoryTesterStyle == cmCTestMemCheckHandler::THREAD_SANITIZER) { envVar = "TSAN_OPTIONS"; --- Summary of changes: Source/CTest/cmCTestMemCheckHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1982-gdeefc13
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, next has been updated via deefc1319b83543ff4ffe65feded4ddc290b6a54 (commit) via 6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b (commit) from 0287d41c435914431fee29ce064a480c5eb59174 (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=deefc1319b83543ff4ffe65feded4ddc290b6a54 commit deefc1319b83543ff4ffe65feded4ddc290b6a54 Merge: 0287d41 6ad05df Author: Brad KingAuthorDate: Tue Jan 10 13:53:13 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:53:13 2017 -0500 Merge topic 'android_clang_asm' into next 6ad05df8 Android: Set compiler target platform when compiling ASM with Clang https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b commit 6ad05df8bafd62b7ecb70d68cb395b72caf5fd8b Author: Florent Castelli AuthorDate: Fri Jan 6 23:33:37 2017 +0100 Commit: Brad King CommitDate: Tue Jan 10 13:51:42 2017 -0500 Android: Set compiler target platform when compiling ASM with Clang diff --git a/Modules/Platform/Android-Clang-ASM.cmake b/Modules/Platform/Android-Clang-ASM.cmake new file mode 100644 index 000..6448da6 --- /dev/null +++ b/Modules/Platform/Android-Clang-ASM.cmake @@ -0,0 +1,2 @@ +include(Platform/Android-Clang) +__android_compiler_clang(ASM) diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index f0cf4a5..f739ab1 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -35,7 +35,9 @@ include(Platform/Android-Common) include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang) macro(__android_compiler_clang lang) - __android_compiler_common(${lang}) + if(NOT "x${lang}" STREQUAL "xASM") +__android_compiler_common(${lang}) + endif() if(NOT CMAKE_${lang}_COMPILER_TARGET) set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}") endif() --- Summary of changes: .../Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake}|2 +- Modules/Platform/Android-Clang.cmake |4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) copy Modules/Platform/{Android-Clang-C.cmake => Android-Clang-ASM.cmake} (51%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1980-g0287d41
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, next has been updated via 0287d41c435914431fee29ce064a480c5eb59174 (commit) via 696339a9d571ff7d3796164dd738a6a2b042 (commit) from 44c85ae38a4401379c411a1e3fefce8aefce0eed (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=0287d41c435914431fee29ce064a480c5eb59174 commit 0287d41c435914431fee29ce064a480c5eb59174 Merge: 44c85ae 696339a Author: Brad KingAuthorDate: Tue Jan 10 13:43:36 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:43:36 2017 -0500 Merge topic 'FindOpenSSL-check-both' into next 696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=696339a9d571ff7d3796164dd738a6a2b042 commit 696339a9d571ff7d3796164dd738a6a2b042 Author: Harry Mallon AuthorDate: Tue Jan 3 19:10:53 2017 + Commit: Brad King CommitDate: Tue Jan 10 13:42:48 2017 -0500 FindOpenSSL: Check that both CRYPTO and SSL libraries are present * Strawberry perl on Windows installs one that is found by the default finder While at it, de-duplicate code setting `OPENSSL_LIBRARIES`. diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 30fc5c6..6259ce1 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -204,7 +204,6 @@ if(WIN32 AND NOT CYGWIN) SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE) set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} ) -set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} ) elseif(MINGW) # same player, for MinGW set(LIB_EAY_NAMES crypto libeay32) @@ -232,7 +231,6 @@ if(WIN32 AND NOT CYGWIN) mark_as_advanced(SSL_EAY LIB_EAY) set(OPENSSL_SSL_LIBRARY ${SSL_EAY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} ) -set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) unset(LIB_EAY_NAMES) unset(SSL_EAY_NAMES) else() @@ -264,7 +262,6 @@ if(WIN32 AND NOT CYGWIN) mark_as_advanced(SSL_EAY LIB_EAY) set(OPENSSL_SSL_LIBRARY ${SSL_EAY} ) set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} ) -set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) endif() else() @@ -298,8 +295,6 @@ else() set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY}) set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) - set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) - endif() function(from_hex HEX DEC) @@ -371,10 +366,13 @@ endif () include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) + if (OPENSSL_VERSION) find_package_handle_standard_args(OpenSSL REQUIRED_VARS - OPENSSL_LIBRARIES + OPENSSL_SSL_LIBRARY + OPENSSL_CRYPTO_LIBRARY OPENSSL_INCLUDE_DIR VERSION_VAR OPENSSL_VERSION @@ -383,7 +381,8 @@ if (OPENSSL_VERSION) ) else () find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" -OPENSSL_LIBRARIES +OPENSSL_SSL_LIBRARY +OPENSSL_CRYPTO_LIBRARY OPENSSL_INCLUDE_DIR ) endif () --- Summary of changes: Modules/FindOpenSSL.cmake | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1978-g44c85ae
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, next has been updated via 44c85ae38a4401379c411a1e3fefce8aefce0eed (commit) via 8deb913d983eee5ad1439ccb98244817d8912602 (commit) via eadd395a1396ed78a3ecea7740f8f4735ab84453 (commit) from 014c446aeeecb24be2a0494f1031cd992fd3d045 (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=44c85ae38a4401379c411a1e3fefce8aefce0eed commit 44c85ae38a4401379c411a1e3fefce8aefce0eed Merge: 014c446 8deb913 Author: Brad KingAuthorDate: Tue Jan 10 13:27:15 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:27:15 2017 -0500 Merge topic 'FindGTest-fixups' into next 8deb913d FindGTest: add lib search path for MSVC x64 platform eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8deb913d983eee5ad1439ccb98244817d8912602 commit 8deb913d983eee5ad1439ccb98244817d8912602 Author: Dong XiaoC AuthorDate: Fri Dec 23 06:31:11 2016 -0500 Commit: Brad King CommitDate: Tue Jan 10 13:26:33 2017 -0500 FindGTest: add lib search path for MSVC x64 platform diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index 931cc18..6540171 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -160,11 +160,17 @@ if(MSVC) if(GTEST_MSVC_SEARCH STREQUAL "MD") list(APPEND _gtest_libpath_suffixes msvc/gtest-md/Debug -msvc/gtest-md/Release) +msvc/gtest-md/Release +msvc/x64/Debug +msvc/x64/Release +) elseif(GTEST_MSVC_SEARCH STREQUAL "MT") list(APPEND _gtest_libpath_suffixes msvc/gtest/Debug -msvc/gtest/Release) +msvc/gtest/Release +msvc/x64/Debug +msvc/x64/Release +) endif() endif() https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eadd395a1396ed78a3ecea7740f8f4735ab84453 commit eadd395a1396ed78a3ecea7740f8f4735ab84453 Author: Dong XiaoC AuthorDate: Fri Dec 23 06:28:25 2016 -0500 Commit: Brad King CommitDate: Tue Jan 10 13:25:59 2017 -0500 FindGTest: Fix documented GTEST_MSVC_SEARCH default value Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add imported targets and update documentation, 2015-12-10) accidentally changed the documented default to the wrong value. Restore the documentation to refer to the actual default used in the implementation. diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index 76ab716..931cc18 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -49,8 +49,8 @@ # The root directory of the Google Test installation (may also be # set as an environment variable) # ``GTEST_MSVC_SEARCH`` -# If compiling with MSVC, this variable can be set to ``MD`` or -# ``MT`` (the default) to enable searching a GTest build tree +# If compiling with MSVC, this variable can be set to ``MT`` or +# ``MD`` (the default) to enable searching a GTest build tree # # # Example usage --- Summary of changes: Modules/FindGTest.cmake | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1975-g014c446
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, next has been updated via 014c446aeeecb24be2a0494f1031cd992fd3d045 (commit) via a9b93501d435bcd30a96e3091255e509fedbb39f (commit) from d954016868c66aa78b66bd94c2d744b8cc42738a (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=014c446aeeecb24be2a0494f1031cd992fd3d045 commit 014c446aeeecb24be2a0494f1031cd992fd3d045 Merge: d954016 a9b9350 Author: Brad KingAuthorDate: Tue Jan 10 13:16:35 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:16:35 2017 -0500 Merge topic 'FindBoost-1.63' into next a9b93501 FindBoost: Add support for 1.63 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9b93501d435bcd30a96e3091255e509fedbb39f commit a9b93501d435bcd30a96e3091255e509fedbb39f Author: Roger Leigh AuthorDate: Tue Dec 27 12:02:54 2016 + Commit: Brad King CommitDate: Tue Jan 10 13:15:34 2017 -0500 FindBoost: Add support for 1.63 diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index ce4f47c..69476203 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -742,6 +742,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) + elseif(NOT Boost_VERSION VERSION_LESS 106300 AND Boost_VERSION VERSION_LESS 106400) +set(_Boost_CHRONO_DEPENDENCIES system) +set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time) +set(_Boost_COROUTINE_DEPENDENCIES context system) +set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time) +set(_Boost_FILESYSTEM_DEPENDENCIES system) +set(_Boost_IOSTREAMS_DEPENDENCIES regex) +set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic) +set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) +set(_Boost_MPI_DEPENDENCIES serialization) +set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization) +set(_Boost_RANDOM_DEPENDENCIES system) +set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) +set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) +set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) else() message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}") set(_Boost_IMPORTED_TARGETS FALSE) @@ -948,7 +963,7 @@ else() # _Boost_COMPONENT_HEADERS. See the instructions at the top of # _Boost_COMPONENT_DEPENDENCIES. set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -"1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" +"1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51" "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1" --- Summary of changes: Modules/FindBoost.cmake | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1973-gd954016
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, next has been updated via d954016868c66aa78b66bd94c2d744b8cc42738a (commit) via 513ef514e51702bf7775f79119f8e3e39ccbb784 (commit) from 14f8a662df08f79471f199ff40444593933e509d (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=d954016868c66aa78b66bd94c2d744b8cc42738a commit d954016868c66aa78b66bd94c2d744b8cc42738a Merge: 14f8a66 513ef51 Author: Brad KingAuthorDate: Tue Jan 10 13:14:22 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:14:22 2017 -0500 Merge topic 'AndroidTestUtilities-fix-cleanup' into next 513ef514 AndroidTestUtilities: fix cleanup operation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=513ef514e51702bf7775f79119f8e3e39ccbb784 commit 513ef514e51702bf7775f79119f8e3e39ccbb784 Author: Ruslan Baratov AuthorDate: Tue Dec 27 21:15:36 2016 +0800 Commit: Brad King CommitDate: Tue Jan 10 13:12:45 2017 -0500 AndroidTestUtilities: fix cleanup operation `su` is not available by default on all devices: ``` > adb shell "echo ls /data/local/tmp | su" /system/bin/sh: su: not found > echo $? 0 ``` Also since `execute_adb_command` use `execute_process` under the hood the pipeline (`|`) will not be treated as special symbol and will be process just like one more command line argument for the `adb`. diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake index f5f2564..d8ca730 100644 --- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake +++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake @@ -117,7 +117,7 @@ function(android_push_test_files_to_device) check_device_file_exists(${_ptd_DEV_TEST_DIR} test_dir_exists) if(test_dir_exists) # This is protected in the SetupProjectTests module. -execute_adb_command(shell echo rm -r ${_ptd_DEV_TEST_DIR} | su) +execute_adb_command(shell rm -r ${_ptd_DEV_TEST_DIR}) endif() execute_adb_command(shell mkdir -p ${_ptd_DEV_TEST_DIR}) --- Summary of changes: Modules/AndroidTestUtilities/PushToAndroidDevice.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1971-g14f8a66
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, next has been updated via 14f8a662df08f79471f199ff40444593933e509d (commit) via b8968b4b3984b425497324c302948a197b2badbd (commit) from 31e1ebf7015852bae9dbc5204e37534ae29c8548 (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=14f8a662df08f79471f199ff40444593933e509d commit 14f8a662df08f79471f199ff40444593933e509d Merge: 31e1ebf b8968b4 Author: Brad KingAuthorDate: Tue Jan 10 13:07:53 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 13:07:53 2017 -0500 Merge topic 'UseSWIG-implicit-depends' into next b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8968b4b3984b425497324c302948a197b2badbd commit b8968b4b3984b425497324c302948a197b2badbd Author: Alexey Sokolov AuthorDate: Wed Dec 21 01:53:41 2016 + Commit: Brad King CommitDate: Tue Jan 10 13:05:59 2017 -0500 UseSWIG: Automatically scan dependencies of SWIG files for Makefiles Issue: #4147 diff --git a/Copyright.txt b/Copyright.txt index aa91102..daaa1d1 100644 --- a/Copyright.txt +++ b/Copyright.txt @@ -37,6 +37,7 @@ The following individuals and institutions are among the Contributors: * Aleksey Avdeev * Alexander Neundorf * Alexander Smorkalov +* Alexey Sokolov * Alex Turbov * Andreas Pakulat * Andreas Schneider @@ -54,6 +55,7 @@ The following individuals and institutions are among the Contributors: * Eran Ifrah * Esben Mose Hansen, Ange Optimization ApS * Geoffrey Viola +* Google Inc * Gregor Jasny * Helio Chissini de Castro * Ilya Lavrenov diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake index 651f9f1..ffb72a0 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -212,6 +212,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile) "${swig_source_file_fullname}" MAIN_DEPENDENCY "${swig_source_file_fullname}" DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS} +IMPLICIT_DEPENDS CXX "${swig_source_file_fullname}" COMMENT "Swig source") set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files} PROPERTIES GENERATED 1) diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx index e6000db..9d4b9cc 100644 --- a/Source/cmDependsC.cxx +++ b/Source/cmDependsC.cxx @@ -12,7 +12,7 @@ #include "cmSystemTools.h" #define INCLUDE_REGEX_LINE\ - "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])" + "^[ \t]*[#%][ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])" #define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: " #define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: " @@ -420,7 +420,7 @@ void cmDependsC::SetupTransforms() if (!this->TransformRules.empty()) { // Construct the regular expression to match lines to be // transformed. -std::string xform = "^([ \t]*#[ \t]*(include|import)[ \t]*)("; +std::string xform = "^([ \t]*[#%][ \t]*(include|import)[ \t]*)("; const char* sep = ""; for (TransformRulesType::const_iterator tri = this->TransformRules.begin(); tri != this->TransformRules.end(); ++tri) { --- Summary of changes: Copyright.txt |2 ++ Modules/UseSWIG.cmake |1 + Source/cmDependsC.cxx |4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1969-g31e1ebf
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, next has been updated via 31e1ebf7015852bae9dbc5204e37534ae29c8548 (commit) via b7f0b1240f9c251d059fafcde878168f2b9a6664 (commit) via ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e (commit) from 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (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=31e1ebf7015852bae9dbc5204e37534ae29c8548 commit 31e1ebf7015852bae9dbc5204e37534ae29c8548 Merge: 63a8770 b7f0b12 Author: Brad KingAuthorDate: Tue Jan 10 12:51:31 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 12:51:31 2017 -0500 Merge topic 'solaris-build-fixes' into next b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11 ba8bb321 Disable libuv on Solaris 10 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f0b1240f9c251d059fafcde878168f2b9a6664 commit b7f0b1240f9c251d059fafcde878168f2b9a6664 Author: Eric Berge AuthorDate: Wed Dec 21 15:38:28 2016 -0600 Commit: Eric Berge CommitDate: Wed Dec 21 22:11:28 2016 -0600 libuv requires _XOPEN_SOURCE 600 on Solaris 11 This avoid build errors from the /usr/include/sys/feature_tests.h include file which disallows setting XOpen versions less than 6 when in C99 mode. diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt index 1b384b5..a8e25ba 100644 --- a/Utilities/cmlibuv/CMakeLists.txt +++ b/Utilities/cmlibuv/CMakeLists.txt @@ -218,8 +218,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") ) list(APPEND uv_defines __EXTENSIONS__ -_XOPEN_SOURCE=500 ) + if(CMAKE_SYSTEM_VERSION STREQUAL "5.10") +list(APPEND uv_defines + _XOPEN_SOURCE=500 + ) + else() +list(APPEND uv_defines + _XOPEN_SOURCE=600 + ) + endif() list(APPEND uv_sources src/unix/sunos.c ) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e commit ba8bb32162ae7bc42c4a3a521a4e4b98274d9d8e Author: Eric Berge AuthorDate: Wed Dec 21 15:34:11 2016 -0600 Commit: Eric Berge CommitDate: Wed Dec 21 15:34:11 2016 -0600 Disable libuv on Solaris 10 Two issues need to be resolved to add Solaris 10 libuv support: 1. libuv needs to provide alternative functionality for systems that do not support mkdtemp() 2. cmake should set SUNOS_NO_IFADDRS for Solaris 10 builds (but not Solaris 11) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aa8010..bec81a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -510,6 +510,9 @@ int main(void) { return 0; } elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") # Disable until it can be ported. set(CMAKE_USE_LIBUV 0) +elseif(CMAKE_SYSTEM STREQUAL "SunOS-5.10") + # Disable until it can be ported. + set(CMAKE_USE_LIBUV 0) endif() endif() if(CMAKE_USE_LIBUV) --- Summary of changes: CMakeLists.txt |3 +++ Utilities/cmlibuv/CMakeLists.txt | 10 +- 2 files changed, 12 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1966-g63a8770
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, next has been updated via 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 (commit) via af77368ed3d81c877fc19a64831aff380cf4646e (commit) from da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (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=63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 commit 63a8770f08d0bcb239ceaaa18f5a6ee99af38be2 Merge: da90f24 af77368 Author: Domen VrankarAuthorDate: Tue Jan 10 12:48:49 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 12:48:49 2017 -0500 Merge topic 'cpack-rpm-user-binary-spec-file-test' into next af77368e CPack/RPM test for using custom binary spec file https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af77368ed3d81c877fc19a64831aff380cf4646e commit af77368ed3d81c877fc19a64831aff380cf4646e Author: Domen Vrankar AuthorDate: Tue Jan 10 18:47:52 2017 +0100 Commit: Domen Vrankar CommitDate: Tue Jan 10 18:47:52 2017 +0100 CPack/RPM test for using custom binary spec file diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake index af44182..ebaf792 100644 --- a/Tests/RunCMake/CPack/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake @@ -4,6 +4,7 @@ include(RunCMake) include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake") # run_cpack_test args: TEST_NAME "GENERATORS" RUN_CMAKE_BUILD_STEP "PACKAGING_TYPES" +run_cpack_test(CUSTOM_BINARY_SPEC_FILE "RPM" false "MONOLITHIC;COMPONENT") run_cpack_test(CUSTOM_NAMES "RPM;DEB" true "COMPONENT") run_cpack_test(DEBUGINFO "RPM" true "COMPONENT") run_cpack_test(DEPENDENCIES "RPM;DEB" true "COMPONENT") diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake new file mode 100644 index 000..694dc00 --- /dev/null +++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/ExpectedFiles.cmake @@ -0,0 +1,9 @@ +set(EXPECTED_FILES_COUNT "1") +set(EXPECTED_FILE_CONTENT_1_LIST "/usr;/usr/foo;/usr/foo/CMakeLists.txt") + +if(PACKAGING_TYPE STREQUAL "COMPONENT") + set(EXPECTED_FILES_COUNT "2") + set(EXPECTED_FILE_1_COMPONENT "test") + set(EXPECTED_FILE_2_COMPONENT "test2") + set(EXPECTED_FILE_CONTENT_2_LIST "/usr;/usr/bar;/usr/bar/CMakeLists.txt") +endif() diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt new file mode 100644 index 000..e6d86d0 --- /dev/null +++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-COMPONENT-stderr.txt @@ -0,0 +1,2 @@ +^CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in +CPackRPM: Will use GENERATED spec file:.*/Tests/RunCMake/RPM/CPack/CUSTOM_BINARY_SPEC_FILE-build/_CPack_Packages/.*/RPM/SPECS/custom_binary_spec_file-test2\.spec$ diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt new file mode 100644 index 000..d7bb7af --- /dev/null +++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/RPM-MONOLITHIC-stderr.txt @@ -0,0 +1 @@ +CPackRPM: Will use USER specified spec file: (/[^/]*)*/CUSTOM_BINARY_SPEC_FILE/custom\.spec\.in diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in new file mode 100644 index 000..db0ac6f --- /dev/null +++ b/Tests/RunCMake/CPack/tests/CUSTOM_BINARY_SPEC_FILE/custom.spec.in @@ -0,0 +1,80 @@ +# -*- rpm-spec -*- +BuildRoot: %_topdir/@CPACK_PACKAGE_FILE_NAME@@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH@ +Summary:@CPACK_RPM_PACKAGE_SUMMARY@ +Name: @CPACK_RPM_PACKAGE_NAME@ +Version:@CPACK_RPM_PACKAGE_VERSION@ +Release:@CPACK_RPM_PACKAGE_RELEASE@ +License:@CPACK_RPM_PACKAGE_LICENSE@ +Group: @CPACK_RPM_PACKAGE_GROUP@ +Vendor: @CPACK_RPM_PACKAGE_VENDOR@ + +@TMP_RPM_URL@ +@TMP_RPM_REQUIRES@ +@TMP_RPM_REQUIRES_PRE@ +@TMP_RPM_REQUIRES_POST@ +@TMP_RPM_REQUIRES_PREUN@ +@TMP_RPM_REQUIRES_POSTUN@ +@TMP_RPM_PROVIDES@ +@TMP_RPM_OBSOLETES@ +@TMP_RPM_CONFLICTS@ +@TMP_RPM_SUGGESTS@ +@TMP_RPM_AUTOPROV@ +@TMP_RPM_AUTOREQ@ +@TMP_RPM_AUTOREQPROV@ +@TMP_RPM_BUILDARCH@ +@TMP_RPM_PREFIXES@ + +@TMP_RPM_DEBUGINFO@ + +%define _rpmdir %_topdir/RPMS +%define _srcrpmdir %_topdir/SRPMS +@FILE_NAME_DEFINE@ +%define
[Cmake-commits] CMake branch, next, updated. v3.7.1-1964-gda90f24
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, next has been updated via da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (commit) via 3578e86272b16b303edd640f29781dd316a857a4 (commit) from f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 (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=da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 commit da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 Merge: f79c8a9 3578e86 Author: Brad KingAuthorDate: Tue Jan 10 11:00:19 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 11:00:19 2017 -0500 Merge topic 'issue-16513-concrt140-dll' into next 3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3578e86272b16b303edd640f29781dd316a857a4 commit 3578e86272b16b303edd640f29781dd316a857a4 Author: Taylor Braun-Jones AuthorDate: Fri Dec 16 18:02:48 2016 -0500 Commit: Taylor Braun-Jones CommitDate: Fri Dec 16 18:02:48 2016 -0500 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0 Fixes #16513 diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index b0446c9..f4ae091 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -182,7 +182,10 @@ if(MSVC) "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll" ) if(NOT v VERSION_LESS 14) -list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll") +list(APPEND __install__libs +"${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll" +"${MSVC${v}_CRT_DIR}/concrt${v}0.dll" +) else() list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll") endif() @@ -197,7 +200,10 @@ if(MSVC) "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll" ) if(NOT v VERSION_LESS 14) -list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll") +list(APPEND __install__libs +"${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll" +"${MSVC${v}_CRT_DIR}/concrt${v}0d.dll" +) else() list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll") endif() --- Summary of changes: Modules/InstallRequiredSystemLibraries.cmake | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1962-gf79c8a9
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, next has been updated via f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 (commit) via b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 (commit) from 3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e (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=f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 commit f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 Merge: 3ae275f b1dc4dd Author: Brad KingAuthorDate: Tue Jan 10 10:57:19 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 10:57:19 2017 -0500 Merge topic 'BundleUtilities-symlink-structure' into next b1dc4ddb BundleUtilities: Maintain symlink structure https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 commit b1dc4ddbdd651e8bdd30878fa9afc840d97c9114 Author: Martin Koegler AuthorDate: Fri Dec 9 21:55:22 2016 +0100 Commit: Brad King CommitDate: Tue Jan 10 10:55:41 2017 -0500 BundleUtilities: Maintain symlink structure Closes: #15047 diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake index b1610e2..5d6f402 100644 --- a/Modules/BundleUtilities.cmake +++ b/Modules/BundleUtilities.cmake @@ -624,6 +624,33 @@ function(get_bundle_keys app libs dirs keys_var) endif() endforeach() +# preserve library symlink structure +foreach(key ${${keys_var}}) + if("${${key}_COPYFLAG}" STREQUAL 1) +if(IS_SYMLINK "${${key}_RESOLVED_ITEM}") + get_filename_component(target "${${key}_RESOLVED_ITEM}" REALPATH) + set_bundle_key_values(${keys_var} "${exe}" "${target}" "${exepath}" "${dirs}" 1 "${exe_rpaths}") + get_item_key("${target}" targetkey) + + if(WIN32) +# ignore case on Windows +string(TOLOWER "${${key}_RESOLVED_ITEM}" resolved_item_compare) +string(TOLOWER "${${targetkey}_RESOLVED_EMBEDDED_ITEM}" resolved_embedded_item_compare) + else() +set(resolved_item_compare "${${key}_RESOLVED_ITEM}") +set(resolved_embedded_item_compare "${${targetkey}_RESOLVED_EMBEDDED_ITEM}") + endif() + get_filename_component(resolved_item_compare "${resolved_item_compare}" NAME) + get_filename_component(resolved_embedded_item_compare "${resolved_embedded_item_compare}" NAME) + + if(NOT "${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}") +set(${key}_COPYFLAG "2") +set(${key}_RESOLVED_ITEM "${${targetkey}_RESOLVED_EMBEDDED_ITEM}") + endif() + +endif() + endif() +endforeach() # Propagate values to caller's scope: # set(${keys_var} ${${keys_var}} PARENT_SCOPE) @@ -640,6 +667,24 @@ function(get_bundle_keys app libs dirs keys_var) endif() endfunction() +function(link_resolved_item_into_bundle resolved_item resolved_embedded_item) + if(WIN32) +# ignore case on Windows +string(TOLOWER "${resolved_item}" resolved_item_compare) +string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare) + else() +set(resolved_item_compare "${resolved_item}") +set(resolved_embedded_item_compare "${resolved_embedded_item}") + endif() + + if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}") +message(STATUS "warning: resolved_item == resolved_embedded_item - not linking...") + else() +get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY) +file(RELATIVE_PATH symlink_target "${target_dir}" "${resolved_item}") +execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${symlink_target}" "${resolved_embedded_item}") + endif() +endfunction() function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item) if(WIN32) @@ -854,7 +899,9 @@ function(fixup_bundle app libs dirs) set(i 0) foreach(key ${keys}) math(EXPR i ${i}+1) - if(${${key}_COPYFLAG}) + if("${${key}_COPYFLAG}" STREQUAL "2") +message(STATUS "${i}/${n}: linking '${${key}_RESOLVED_ITEM}' -> '${${key}_RESOLVED_EMBEDDED_ITEM}'") + elseif(${${key}_COPYFLAG}) message(STATUS "${i}/${n}: copying '${${key}_RESOLVED_ITEM}'") else() message(STATUS "${i}/${n}: *NOT* copying '${${key}_RESOLVED_ITEM}'") @@ -872,7 +919,10 @@ function(fixup_bundle app libs dirs) message(STATUS "") endif() - if(${${key}_COPYFLAG}) + if("${${key}_COPYFLAG}" STREQUAL "2") +
[Cmake-commits] CMake branch, next, updated. v3.7.1-1960-g3ae275f
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, next has been updated via 3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e (commit) via 154def305e7a95d9280573b053170b17539c9f69 (commit) from ae4b031f2bcd15bb06edb97a217d8461926cc950 (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=3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e commit 3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e Merge: ae4b031 154def3 Author: Brad KingAuthorDate: Tue Jan 10 10:53:22 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 10:53:22 2017 -0500 Merge topic 'SublimeText-no-VERBOSE' into next 154def30 Sublime: Do not build with verbose output https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154def305e7a95d9280573b053170b17539c9f69 commit 154def305e7a95d9280573b053170b17539c9f69 Author: Richard Collins AuthorDate: Fri Dec 16 12:41:55 2016 -0500 Commit: Brad King CommitDate: Tue Jan 10 10:52:48 2017 -0500 Sublime: Do not build with verbose output Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`. diff --git a/Help/release/dev/SublimeText-no-VERBOSE.rst b/Help/release/dev/SublimeText-no-VERBOSE.rst new file mode 100644 index 000..70dfa2b --- /dev/null +++ b/Help/release/dev/SublimeText-no-VERBOSE.rst @@ -0,0 +1,6 @@ +SublimeText-no-VERBOSE +-- + +* The :generator:`Sublime Text 2` generator no longer runs the native + build command (e.g. ``ninja`` or ``make``) with verbose build output + enabled. diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index dfefefe..36ba520 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -323,16 +323,12 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand( std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile); command += ", \"/NOLOGO\", \"/f\", \""; command += makefileName + "\""; -command += ", \"VERBOSE=1\", \""; -command += target; -command += "\""; +command += ", \"" + target + "\""; } else if (generator == "Ninja") { std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile); command += ", \"-f\", \""; command += makefileName + "\""; -command += ", \"-v\", \""; -command += target; -command += "\""; +command += ", \"" + target + "\""; } else { std::string makefileName; if (generator == "MinGW Makefiles") { @@ -344,9 +340,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand( } command += ", \"-f\", \""; command += makefileName + "\""; -command += ", \"VERBOSE=1\", \""; -command += target; -command += "\""; +command += ", \"" + target + "\""; } return command; } --- Summary of changes: Help/release/dev/SublimeText-no-VERBOSE.rst |6 ++ Source/cmExtraSublimeTextGenerator.cxx | 12 +++- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 Help/release/dev/SublimeText-no-VERBOSE.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1958-gae4b031
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, next has been updated via ae4b031f2bcd15bb06edb97a217d8461926cc950 (commit) via c93e85d87e683e4c20e5f29726889279aea9d921 (commit) via 18c8278b622e4cb9b155c5dc4ceac93322bed85f (commit) via d47bda00b2e46b3fd6f9e050f3f21b5337ac244b (commit) via efdfc26e14b5a4d8b52a1021ffe85418cdfc802f (commit) via ad5b702c0914e0912693b9e5a84d9fe4bb53d720 (commit) via def7395f6278c096ab8f4f418cd5db5059c8c314 (commit) from 29234c055a20494f76f9653fa11df5bc7d901ebd (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=ae4b031f2bcd15bb06edb97a217d8461926cc950 commit ae4b031f2bcd15bb06edb97a217d8461926cc950 Merge: 29234c0 c93e85d Author: Brad KingAuthorDate: Tue Jan 10 10:23:30 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 10:23:30 2017 -0500 Merge topic 'vs15-detect-from-installer' into next c93e85d8 VS: Use Visual Studio Installer to locate VS 2017 18c8278b VS: Add helper class to interact with Visual Studio Installer d47bda00 VS: Fix VS 2017 Windows Store toolset selection efdfc26e VS: Drop check for VS 15 Express Edition ad5b702c VS: Port Visual Studio Setup third-party header to MinGW def7395f VS: Add Visual Studio Setup third-party header https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c93e85d87e683e4c20e5f29726889279aea9d921 commit c93e85d87e683e4c20e5f29726889279aea9d921 Author: Iyyappa Murugandi AuthorDate: Wed Dec 14 18:53:30 2016 -0800 Commit: Brad King CommitDate: Fri Dec 16 09:58:43 2016 -0500 VS: Use Visual Studio Installer to locate VS 2017 VS 2017 and later may no longer populate the Windows Registry entries CMake has traditionally used to find the VS installations. This is because VS now supports having multiple installations of the same version. The Visual Studio Installer tool provides a COM interface we can query to locate installations. diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index dde6e82..e27615a 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -425,20 +425,6 @@ std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand() } } - // Search where VS15Preview places it. - mskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;"; - mskey += this->GetIDEVersion(); - if (cmSystemTools::ReadRegistryValue(mskey.c_str(), msbuild, - cmSystemTools::KeyWOW64_32)) { -cmSystemTools::ConvertToUnixSlashes(msbuild); -msbuild += "/MSBuild/"; -msbuild += this->GetIDEVersion(); -msbuild += "/Bin/MSBuild.exe"; -if (cmSystemTools::FileExists(msbuild, true)) { - return msbuild; -} - } - msbuild = "MSBuild.exe"; return msbuild; } diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx index 4299081..d11ee7c 100644 --- a/Source/cmGlobalVisualStudio15Generator.cxx +++ b/Source/cmGlobalVisualStudio15Generator.cxx @@ -8,6 +8,7 @@ #include "cmMakefile.h" #include "cmVS141CLFlagTable.h" #include "cmVS141CSharpFlagTable.h" +#include "cmVSSetupHelper.h" static const char vs15generatorName[] = "Visual Studio 15 2017"; @@ -126,21 +127,44 @@ bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset( bool cmGlobalVisualStudio15Generator::IsWindowsDesktopToolsetInstalled() const { - const char desktop10Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" - "VisualStudio\\15.0\\VC\\Runtimes"; - - std::vector vc15; - return cmSystemTools::GetRegistrySubKeys(desktop10Key, vc15, - cmSystemTools::KeyWOW64_32); + return vsSetupAPIHelper.IsVS2017Installed(); } bool cmGlobalVisualStudio15Generator::IsWindowsStoreToolsetInstalled() const { - const char universal10Key[] = -"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\" -"VisualStudio\\15.0\\Setup\\Build Tools for Windows 10;SrcPath"; + return vsSetupAPIHelper.IsWin10SDKInstalled(); +} + +std::string cmGlobalVisualStudio15Generator::FindMSBuildCommand() +{ + std::string msbuild; + + // Ask Visual Studio Installer tool. + std::string vs; + if (vsSetupAPIHelper.GetVSInstanceInfo(vs)) { +msbuild = vs + "/MSBuild/15.0/Bin/MSBuild.exe"; +if (cmSystemTools::FileExists(msbuild)) { + return msbuild; +} + } + + msbuild = "MSBuild.exe"; + return
[Cmake-commits] CMake branch, next, updated. v3.7.1-1951-g29234c0
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, next has been updated via 29234c055a20494f76f9653fa11df5bc7d901ebd (commit) via c52e556f1324662f168daf8e32366e3144e523d0 (commit) via eabef10641eb8c995a5e1f732b4d2c2caea1b655 (commit) via 372f25218eaecf27916760990c39ffdf376494e3 (commit) via 0db926e9ea39c71cf8caa15bfaebc1a1474613be (commit) via eb0d73faea66a440ff5594752de1d251e81dbbd4 (commit) via a899d1f02d75de80161dcd6544ddacd45d231c84 (commit) via cf394dbe507c5bcd076c02c9654eb44174682ad7 (commit) via 5443e3966190b3e4aaad445e2a406d6ac9d0d9fa (commit) via d17683e7dfee0bc7b12afbd62e57c7d512cbc73a (commit) via 306c30e6007215ff4adfa9c5be28284ba8ac05ad (commit) via bc5d62e4f7e190b567fd5e9f5364fa78da076ff5 (commit) from 4b74150218a9c0ab28070d10c87f4391b724bba6 (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=29234c055a20494f76f9653fa11df5bc7d901ebd commit 29234c055a20494f76f9653fa11df5bc7d901ebd Merge: 4b74150 c52e556 Author: Brad KingAuthorDate: Tue Jan 10 10:23:17 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 10:23:17 2017 -0500 Merge topic 'cuda-windows' into next c52e556f CUDA: Enable CudaOnly.SeparateCompilation test runtime calls eabef106 CUDA: Port test cases to Windows with MSVC host compiler 372f2521 CUDA: Populate NVIDIA compiler information on Windows 0db926e9 CUDA: Detect implicit link information on Windows eb0d73fa CUDA: Find MSVC binutils on Windows a899d1f0 CUDA: Populate compiler PDB placeholder during device linking cf394dbe CUDA: Use `.obj` object file extension on Windows 5443e396 CUDA: Detect MSVC architecture id d17683e7 CUDA: Detect use of MSVC host compiler 306c30e6 CUDA: Allow platform files to set device linking rules bc5d62e4 CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c52e556f1324662f168daf8e32366e3144e523d0 commit c52e556f1324662f168daf8e32366e3144e523d0 Author: Brad King AuthorDate: Thu Dec 15 15:17:08 2016 -0500 Commit: Brad King CommitDate: Fri Dec 16 11:12:15 2016 -0500 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls Uncomment the calls in `main.cpp` (and fix the signatures). diff --git a/Tests/CudaOnly/SeparateCompilation/main.cu b/Tests/CudaOnly/SeparateCompilation/main.cu index d4520ae..5c8e150 100644 --- a/Tests/CudaOnly/SeparateCompilation/main.cu +++ b/Tests/CudaOnly/SeparateCompilation/main.cu @@ -4,12 +4,12 @@ #include "file1.h" #include "file2.h" -// result_type file4_launch_kernel(int x); -// result_type file5_launch_kernel(int x); +int file4_launch_kernel(int x); +int file5_launch_kernel(int x); int main(int argc, char **argv) { - // file4_launch_kernel(42); - // file5_launch_kernel(42); + file4_launch_kernel(42); + file5_launch_kernel(42); return 0; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eabef10641eb8c995a5e1f732b4d2c2caea1b655 commit eabef10641eb8c995a5e1f732b4d2c2caea1b655 Author: Brad King AuthorDate: Wed Dec 7 11:45:44 2016 -0500 Commit: Brad King CommitDate: Fri Dec 16 11:12:14 2016 -0500 CUDA: Port test cases to Windows with MSVC host compiler diff --git a/Tests/Cuda/Complex/dynamic.cpp b/Tests/Cuda/Complex/dynamic.cpp index d579f1e..3848ce7 100644 --- a/Tests/Cuda/Complex/dynamic.cpp +++ b/Tests/Cuda/Complex/dynamic.cpp @@ -1,5 +1,11 @@ -int dynamic_base_func(int x) +#ifdef _WIN32 +#define EXPORT __declspec(dllexport) +#else +#define EXPORT +#endif + +EXPORT int dynamic_base_func(int x) { return x * x; } diff --git a/Tests/Cuda/Complex/dynamic.cu b/Tests/Cuda/Complex/dynamic.cu index ea52acb..a23dc25 100644 --- a/Tests/Cuda/Complex/dynamic.cu +++ b/Tests/Cuda/Complex/dynamic.cu @@ -3,9 +3,15 @@ #include #include +#ifdef _WIN32 +#define EXPORT __declspec(dllexport) +#else +#define EXPORT +#endif + int dynamic_base_func(int); -int __host__ cuda_dynamic_host_func(int x) +EXPORT int __host__ cuda_dynamic_host_func(int x) { return dynamic_base_func(x); } @@ -16,7 +22,7 @@ void DetermineIfValidCudaDevice() { } -void cuda_dynamic_lib_func() +EXPORT void cuda_dynamic_lib_func() { DetermineIfValidCudaDevice <<<1,1>>> (); cudaError_t err = cudaGetLastError(); diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp index 32312d0..5a3f820 100644 --- a/Tests/Cuda/Complex/main.cpp +++
[Cmake-commits] CMake branch, next, updated. v3.7.1-1939-g4b74150
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, next has been updated via 4b74150218a9c0ab28070d10c87f4391b724bba6 (commit) via 5ffee691ee0c55d043238960cf1149cbcfb86047 (commit) from 89a350e455008070ec9c4c6ed55e1e4fb681921b (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=4b74150218a9c0ab28070d10c87f4391b724bba6 commit 4b74150218a9c0ab28070d10c87f4391b724bba6 Merge: 89a350e 5ffee69 Author: Brad KingAuthorDate: Tue Jan 10 09:53:50 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:53:50 2017 -0500 Merge topic 'pgsql-yum' into next 5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ffee691ee0c55d043238960cf1149cbcfb86047 commit 5ffee691ee0c55d043238960cf1149cbcfb86047 Author: Rolf Eike Beer AuthorDate: Thu Dec 29 11:05:36 2016 +0100 Commit: Brad King CommitDate: Tue Jan 10 09:52:42 2017 -0500 FindPostgreSQL: automatically find installations from yum.postgresql.org In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was removed. This was used e.g. by osm2pgsql to be able to build on CentOS with recent PostgreSQL versions. At least add those locations from yum.postgresql.org, which is a more or less official location. diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index 874128c..9e2194c 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -88,8 +88,13 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS}) "PostgreSQL/${suffix}/include/server") endif() if(UNIX) +list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES +"pgsql-${suffix}/lib") +list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES +"pgsql-${suffix}/include") list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES -"postgresql/${suffix}/server") +"postgresql/${suffix}/server" +"pgsql-${suffix}/include/server") endif() endforeach() --- Summary of changes: Modules/FindPostgreSQL.cmake |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-945-g9239141
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 9239141e954c6b9eaba53fcad46fa2de24d8ba44 (commit) via 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (commit) via c0bd1eb6d0da40d429120e925aa755a1f5a754e8 (commit) via 33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit) from aff368bb8456694e2550e2f69451456728ab31eb (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=9239141e954c6b9eaba53fcad46fa2de24d8ba44 commit 9239141e954c6b9eaba53fcad46fa2de24d8ba44 Merge: aff368b 0471d13 Author: Brad KingAuthorDate: Tue Jan 10 09:34:43 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:43 2017 -0500 Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master' 0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into cmake-server-do-not-crash-on-interface-lib-for-master c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY 33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY --- Summary of changes: Source/cmServerProtocol.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1937-g89a350e
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, next has been updated via 89a350e455008070ec9c4c6ed55e1e4fb681921b (commit) via 914728f8d724e834a402619d05309ad8154ba59d (commit) via c43cf158d74460440dc5a3d0aec984c754f57958 (commit) via 2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (commit) via 039a7df9bada6d061f34728a0bb57fdcb9e277c1 (commit) via ea62999f457a4263702a7f01e2c9bd8070da1e01 (commit) via 9239141e954c6b9eaba53fcad46fa2de24d8ba44 (commit) from b641f2b873d55f8ba7b99db906fe6a780a910369 (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=89a350e455008070ec9c4c6ed55e1e4fb681921b commit 89a350e455008070ec9c4c6ed55e1e4fb681921b Merge: b641f2b 914728f Author: Brad KingAuthorDate: Tue Jan 10 09:35:06 2017 -0500 Commit: Brad King CommitDate: Tue Jan 10 09:35:06 2017 -0500 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-951-g2c8eb26
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 2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (commit) via 6daa2d384ef7f6f9edd5fed18c830168f7496881 (commit) from 039a7df9bada6d061f34728a0bb57fdcb9e277c1 (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=2c8eb2696a8f3505d45ed5accfa94b3e5541e169 commit 2c8eb2696a8f3505d45ed5accfa94b3e5541e169 Merge: 039a7df 6daa2d3 Author: Brad KingAuthorDate: Tue Jan 10 09:34:52 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:52 2017 -0500 Merge topic 'cpack-deb-md5sums-paths-fix' 6daa2d38 CPack/Deb invalid md5sums file fix --- Summary of changes: Source/CPack/cmCPackDebGenerator.cxx |6 +- Tests/RunCMake/CPack/RunCMakeTest.cmake |1 + Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake |0 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake|3 +++ Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake|5 + 5 files changed, 14 insertions(+), 1 deletion(-) copy Tests/RunCMake/CPack/tests/{DIST => MD5SUMS}/ExpectedFiles.cmake (100%) create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-955-gc43cf15
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 c43cf158d74460440dc5a3d0aec984c754f57958 (commit) via 36bc7e4c3f91c560df8051afedddea3f49474264 (commit) via 05c14ea0a97f3e8a7287f3e0bbc57f91e2a6e490 (commit) via 5b0a64ebc5d03a4dd0022b87e8e6cb77c3db013b (commit) from 2c8eb2696a8f3505d45ed5accfa94b3e5541e169 (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=c43cf158d74460440dc5a3d0aec984c754f57958 commit c43cf158d74460440dc5a3d0aec984c754f57958 Merge: 2c8eb26 36bc7e4 Author: Brad KingAuthorDate: Tue Jan 10 09:34:55 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:55 2017 -0500 Merge topic 'cpack-new-tests' 36bc7e4c store old locale to a temporary variable 05c14ea0 RunCMake.CPack_* add COMPONENT to minimal test 5b0a64eb CPack/Archive minimal tests for more formats --- Summary of changes: Source/cmLocale.h |5 +- Tests/RunCMake/CMakeLists.txt |2 +- Tests/RunCMake/CPack/7Z/Helpers.cmake |3 + .../CPack/{TGZ => 7Z}/Prerequirements.cmake|0 .../{TGZ => 7Z}/packaging_COMPONENT_default.cmake |0 .../common_helpers.cmake} | 16 ++--- Tests/RunCMake/CPack/RunCMakeTest.cmake|2 +- Tests/RunCMake/CPack/TBZ2/Helpers.cmake|3 + .../CPack/{TGZ => TBZ2}/Prerequirements.cmake |0 .../packaging_COMPONENT_default.cmake |0 Tests/RunCMake/CPack/TGZ/Helpers.cmake | 63 +--- Tests/RunCMake/CPack/TXZ/Helpers.cmake |3 + .../CPack/{TGZ => TXZ}/Prerequirements.cmake |0 .../{TGZ => TXZ}/packaging_COMPONENT_default.cmake |0 Tests/RunCMake/CPack/TZ/Helpers.cmake |3 + .../CPack/{TGZ => TZ}/Prerequirements.cmake|0 .../{TGZ => TZ}/packaging_COMPONENT_default.cmake |0 Tests/RunCMake/CPack/ZIP/Helpers.cmake |3 + .../CPack/{TGZ => ZIP}/Prerequirements.cmake |0 .../{TGZ => ZIP}/packaging_COMPONENT_default.cmake |0 Tests/RunCMake/CPack/tests/MINIMAL/test.cmake |4 ++ 21 files changed, 34 insertions(+), 73 deletions(-) create mode 100644 Tests/RunCMake/CPack/7Z/Helpers.cmake copy Tests/RunCMake/CPack/{TGZ => 7Z}/Prerequirements.cmake (100%) copy Tests/RunCMake/CPack/{TGZ => 7Z}/packaging_COMPONENT_default.cmake (100%) copy Tests/RunCMake/CPack/{TGZ/Helpers.cmake => ArchiveCommon/common_helpers.cmake} (77%) create mode 100644 Tests/RunCMake/CPack/TBZ2/Helpers.cmake copy Tests/RunCMake/CPack/{TGZ => TBZ2}/Prerequirements.cmake (100%) copy Tests/RunCMake/CPack/{TGZ => TBZ2}/packaging_COMPONENT_default.cmake (100%) create mode 100644 Tests/RunCMake/CPack/TXZ/Helpers.cmake copy Tests/RunCMake/CPack/{TGZ => TXZ}/Prerequirements.cmake (100%) copy Tests/RunCMake/CPack/{TGZ => TXZ}/packaging_COMPONENT_default.cmake (100%) create mode 100644 Tests/RunCMake/CPack/TZ/Helpers.cmake copy Tests/RunCMake/CPack/{TGZ => TZ}/Prerequirements.cmake (100%) copy Tests/RunCMake/CPack/{TGZ => TZ}/packaging_COMPONENT_default.cmake (100%) create mode 100644 Tests/RunCMake/CPack/ZIP/Helpers.cmake copy Tests/RunCMake/CPack/{TGZ => ZIP}/Prerequirements.cmake (100%) copy Tests/RunCMake/CPack/{TGZ => ZIP}/packaging_COMPONENT_default.cmake (100%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-947-gea62999
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 ea62999f457a4263702a7f01e2c9bd8070da1e01 (commit) via 574c81e28cef6737adc1619ce3b44b43bdcf308b (commit) from 9239141e954c6b9eaba53fcad46fa2de24d8ba44 (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=ea62999f457a4263702a7f01e2c9bd8070da1e01 commit ea62999f457a4263702a7f01e2c9bd8070da1e01 Merge: 9239141 574c81e Author: Brad KingAuthorDate: Tue Jan 10 09:34:46 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:46 2017 -0500 Merge topic 'cpack-rpm-user-binary-spec-file-fix' 574c81e2 CPack/RPM fix - custom binary spec file handling --- Summary of changes: Modules/CPackRPM.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-949-g039a7df
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 039a7df9bada6d061f34728a0bb57fdcb9e277c1 (commit) via adbf72280d1eb823402c4cc7f2c27ec0ef16062a (commit) from ea62999f457a4263702a7f01e2c9bd8070da1e01 (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=039a7df9bada6d061f34728a0bb57fdcb9e277c1 commit 039a7df9bada6d061f34728a0bb57fdcb9e277c1 Merge: ea62999 adbf722 Author: Brad KingAuthorDate: Tue Jan 10 09:34:49 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:49 2017 -0500 Merge topic 'cpack-test-extra-std-out-err-file-overloads' adbf7228 CPack test additional std out/err regex file overloads --- Summary of changes: Tests/RunCMake/CPack/CPackTestHelpers.cmake |6 +- Tests/RunCMake/CPack/README.txt | 15 +-- 2 files changed, 18 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.7.1-957-g914728f
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 914728f8d724e834a402619d05309ad8154ba59d (commit) via 4164078c8540bbf75b47afd5c1bee0acbbd5b253 (commit) from c43cf158d74460440dc5a3d0aec984c754f57958 (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=914728f8d724e834a402619d05309ad8154ba59d commit 914728f8d724e834a402619d05309ad8154ba59d Merge: c43cf15 4164078 Author: Brad KingAuthorDate: Tue Jan 10 09:34:58 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:34:58 2017 -0500 Merge topic '16204-regex-explorer-match-all' 4164078c cmake-gui: Add MATCHALL option to Regex Explorer --- Summary of changes: Source/QtDialog/RegexExplorer.cxx | 34 -- Source/QtDialog/RegexExplorer.h |1 + Source/QtDialog/RegexExplorer.ui | 37 - 3 files changed, 65 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1930-gb641f2b
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, next has been updated via b641f2b873d55f8ba7b99db906fe6a780a910369 (commit) via 4164078c8540bbf75b47afd5c1bee0acbbd5b253 (commit) from f14f4875429bcc4445ec06328f42d3243bd36892 (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=b641f2b873d55f8ba7b99db906fe6a780a910369 commit b641f2b873d55f8ba7b99db906fe6a780a910369 Merge: f14f487 4164078 Author: Brad KingAuthorDate: Tue Jan 10 09:28:37 2017 -0500 Commit: CMake Topic Stage CommitDate: Tue Jan 10 09:28:37 2017 -0500 Merge topic '16204-regex-explorer-match-all' into next 4164078c cmake-gui: Add MATCHALL option to Regex Explorer https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4164078c8540bbf75b47afd5c1bee0acbbd5b253 commit 4164078c8540bbf75b47afd5c1bee0acbbd5b253 Author: Gregor Jasny AuthorDate: Tue Dec 27 16:38:09 2016 +0100 Commit: Brad King CommitDate: Tue Jan 10 09:28:13 2017 -0500 cmake-gui: Add MATCHALL option to Regex Explorer Closes: #16204 diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx index 1512166..abed70e 100644 --- a/Source/QtDialog/RegexExplorer.cxx +++ b/Source/QtDialog/RegexExplorer.cxx @@ -64,10 +64,32 @@ void RegexExplorer::on_inputText_textChanged() return; } + std::string matchingText; + + if (matchAll->isChecked()) { +const char* p = m_text.c_str(); +while (m_regexParser.find(p)) { + std::string::size_type l = m_regexParser.start(); + std::string::size_type r = m_regexParser.end(); + if (r - l == 0) { +// matched empty string +clearMatch(); +return; + } + if (!matchingText.empty()) { +matchingText += ";"; + } + matchingText += std::string(p + l, r - l); + p += r; +} + } else { +matchingText = m_regexParser.match(0); + } + #ifdef QT_NO_STL - QString matchText = m_regexParser.match(0).c_str(); + QString matchText = matchingText.c_str(); #else - QString matchText = QString::fromStdString(m_regexParser.match(0)); + QString matchText = QString::fromStdString(matchingText); #endif match0->setPlainText(matchText); @@ -95,8 +117,16 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int index) matchN->setPlainText(match); } +void RegexExplorer::on_matchAll_toggled(bool checked) +{ + Q_UNUSED(checked); + + on_inputText_textChanged(); +} + void RegexExplorer::clearMatch() { + m_matched = false; match0->clear(); matchN->clear(); } diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h index f1c1e5f..caef975 100644 --- a/Source/QtDialog/RegexExplorer.h +++ b/Source/QtDialog/RegexExplorer.h @@ -22,6 +22,7 @@ private slots: void on_regularExpression_textChanged(const QString& text); void on_inputText_textChanged(); void on_matchNumber_currentIndexChanged(int index); + void on_matchAll_toggled(bool checked); private: static void setStatusColor(QWidget* widget, bool successful); diff --git a/Source/QtDialog/RegexExplorer.ui b/Source/QtDialog/RegexExplorer.ui index 2c2d761..0af6 100644 --- a/Source/QtDialog/RegexExplorer.ui +++ b/Source/QtDialog/RegexExplorer.ui @@ -104,11 +104,38 @@ - - - Complete Match - - + + + + +Complete Match + + + + + + +Qt::Horizontal + + +QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + +Match All + + + + --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits