[Cmake-commits] CMake branch, master, updated. v3.0.0-1399-g3dce6aa
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 3dce6aa39d1dc2c1f88edebc91ab60de9d3ff6b1 (commit) from 49bf3e7d8daab2a1e7ba435d011618bd2c516766 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dce6aa39d1dc2c1f88edebc91ab60de9d3ff6b1 commit 3dce6aa39d1dc2c1f88edebc91ab60de9d3ff6b1 Author: Kitware Robot AuthorDate: Wed Jul 16 00:01:13 2014 -0400 Commit: Kitware Robot CommitDate: Wed Jul 16 00:01:13 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9a1bcdd..e2849ca 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 0) -set(CMake_VERSION_PATCH 20140715) +set(CMake_VERSION_PATCH 20140716) #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.0.0-4270-g35318f6
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 35318f60ed0af2b59a4bdb2b781b7af72bb3fc03 (commit) via 7a82885b41a63f6786489303c44351cbafe9b0c4 (commit) via 5f8a81b4d7a39007144fd1b0606a7ca3824d5928 (commit) from 338096a46bdf0c6354b0c6678de6717e386546ab (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35318f60ed0af2b59a4bdb2b781b7af72bb3fc03 commit 35318f60ed0af2b59a4bdb2b781b7af72bb3fc03 Merge: 338096a 7a82885 Author: Bill Hoffman AuthorDate: Tue Jul 15 15:09:43 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 15:09:43 2014 -0400 Merge topic 'thread-sanitizer' into next 7a82885b Fix MemoryCheckType from ctest -T memcheck. 5f8a81b4 Add support for memory and leak sanitizer. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a82885b41a63f6786489303c44351cbafe9b0c4 commit 7a82885b41a63f6786489303c44351cbafe9b0c4 Author: Bill Hoffman AuthorDate: Tue Jul 15 14:19:14 2014 -0400 Commit: Bill Hoffman CommitDate: Tue Jul 15 14:19:14 2014 -0400 Fix MemoryCheckType from ctest -T memcheck. Before this commit, you would have to run ctest -S mode to get MemoryCheckType to work. This is because CMAKE_COMMAND was not set. The fix was to use cmSystemTools::GetCMakeCommand instead. diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 68fadf6..0420882 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -71,6 +71,7 @@ Compiler: @CMAKE_CXX_COMPILER@ PurifyCommand: @PURIFYCOMMAND@ ValgrindCommand: @VALGRIND_COMMAND@ ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@ +MemoryCheckType: @MEMORYCHECK_TYPE@ MemoryCheckCommand: @MEMORYCHECK_COMMAND@ MemoryCheckCommandOptions: @MEMORYCHECK_COMMAND_OPTIONS@ MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@ diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index a389359..ed57949 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -346,8 +346,8 @@ void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf) this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_MEMCHECK_IGNORE", this->CustomTestsIgnore); - this->CTest->SetCTestConfigurationFromCMakeVariable( -mf, "CMakeCommand", "CMAKE_COMMAND"); + std::string cmake = cmSystemTools::GetCMakeCommand(); + this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str()); } //-- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f8a81b4d7a39007144fd1b0606a7ca3824d5928 commit 5f8a81b4d7a39007144fd1b0606a7ca3824d5928 Author: Bill Hoffman AuthorDate: Mon Jul 14 17:01:47 2014 -0400 Commit: Bill Hoffman CommitDate: Tue Jul 15 11:13:09 2014 -0400 Add support for memory and leak sanitizer. This adds support for memory and leak sanitizers. This is built into clang and gcc 4.8 and new compilers. It is activated with a -f switch during compile. diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index bcf09ad..a389359 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -45,11 +45,23 @@ static CatToErrorType cmCTestMemCheckBoundsChecker[] = { {0,0} }; +static void xmlReportError(int line, const char* msg, void* data) +{ + cmCTest* ctest = (cmCTest*)data; + cmCTestLog(ctest, ERROR_MESSAGE, + "Error parsing XML in stream at line " + << line << ": " << msg << std::endl); +} + // parse the xml file containing the results of last BoundsChecker run class cmBoundsCheckerParser : public cmXMLParser { public: - cmBoundsCheckerParser(cmCTest* c) { this->CTest = c;} + cmBoundsCheckerParser(cmCTest* c) +{ + this->CTest = c; + this->SetErrorCallback(xmlReportError, (void*)c); +} void StartElement(const std::string& name, const char** atts) { if(name == "MemoryLeak" || @@ -361,6 +373,9 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os) case cmCTestMemCheckHandler::THREAD_SANITIZER: os << "ThreadSanitizer"; break; +case cmCTestMemCheckHandler::ADDRESS_SANITIZER: + os << "AddressSanitizer"; + break; default: os << "Unknown"; } @@ -529,6 +544,14 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() this->MemoryTesterStyle = cmCTestMemCheckHandler::THREAD_SANITIZER; this->Log
[Cmake-commits] CMake branch, next, updated. v3.0.0-4267-g338096a
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 338096a46bdf0c6354b0c6678de6717e386546ab (commit) via b8aa74842785fc6d5b56ad3745dbbcd9d93d257f (commit) from 9ba0ee21f31631968832bfe2174d7d8426ce3d8c (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=338096a46bdf0c6354b0c6678de6717e386546ab commit 338096a46bdf0c6354b0c6678de6717e386546ab Merge: 9ba0ee2 b8aa748 Author: Brad King AuthorDate: Tue Jul 15 14:32:22 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 14:32:22 2014 -0400 Merge topic 'fix_Xcode_generator_name' into next b8aa7484 Tests: No SubDirSpaces on Xcode http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8aa74842785fc6d5b56ad3745dbbcd9d93d257f commit b8aa74842785fc6d5b56ad3745dbbcd9d93d257f Author: Brad King AuthorDate: Tue Jul 15 14:33:21 2014 -0400 Commit: Brad King CommitDate: Tue Jul 15 14:33:21 2014 -0400 Tests: No SubDirSpaces on Xcode diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d25986b..ca7fcdc 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1502,7 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ) endif() - if(MAKE_SUPPORTS_SPACES) + if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL "Xcode") add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/SubDirSpaces" --- Summary of changes: Tests/CMakeLists.txt |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.0.0-4265-g9ba0ee2
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 9ba0ee21f31631968832bfe2174d7d8426ce3d8c (commit) via 8722b540895a3959a932d6fbe349465c05a72492 (commit) via 1657c4a51e18a63ec5439e3a52e29787ad2e1f65 (commit) from 9cfdb3b3a43de0366b59c18ee1dc86a24299eefd (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ba0ee21f31631968832bfe2174d7d8426ce3d8c commit 9ba0ee21f31631968832bfe2174d7d8426ce3d8c Merge: 9cfdb3b 8722b54 Author: Brad King AuthorDate: Tue Jul 15 14:02:22 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 14:02:22 2014 -0400 Merge topic 'generalize-LINK_ONLY' into next 8722b540 Honor $ when checking interface properties 1657c4a5 Make $ available to projects (#14751) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8722b540895a3959a932d6fbe349465c05a72492 commit 8722b540895a3959a932d6fbe349465c05a72492 Author: Brad King AuthorDate: Tue Jul 15 11:34:02 2014 -0400 Commit: Brad King CommitDate: Tue Jul 15 13:23:50 2014 -0400 Honor $ when checking interface properties Callers of cmTarget::GetLinkImplementationClosure are interested in the set of targets whose interface properties propagate to the current target. This excludes targets guarded by $. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index bdf361e..c22d23e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -6038,7 +6038,7 @@ void processILibs(const std::string& config, { tgts.push_back(item.Target); if(cmTarget::LinkInterface const* iface = - item.Target->GetLinkInterfaceLibraries(config, headTarget, false)) + item.Target->GetLinkInterfaceLibraries(config, headTarget, true)) { for(std::vector::const_iterator it = iface->Libraries.begin(); http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1657c4a51e18a63ec5439e3a52e29787ad2e1f65 commit 1657c4a51e18a63ec5439e3a52e29787ad2e1f65 Author: Brad King AuthorDate: Tue Jul 15 11:14:49 2014 -0400 Commit: Brad King CommitDate: Tue Jul 15 13:23:30 2014 -0400 Make $ available to projects (#14751) Previously this generator expression was used internally by the target_link_libraries command to honor private linking requirements of static libraries in their INTERFACE_LINK_LIBRARIES. Remove the check that limits $ to this use case to make it available for project code to use too. diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 9e82674..bc24798 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -188,6 +188,13 @@ property is non-empty:: Marks ``...`` as being the name of a target. This is required if exporting targets to multiple dependent export sets. The ``...`` must be a literal name of a target- it may not contain generator expressions. +``$`` + Content of ``...`` except when evaluated in a link interface while + propagating :ref:`Target Usage Requirements`, in which case it is the + empty string. + Intended for use only in an :prop_tgt:`INTERFACE_LINK_LIBRARIES` target + property, perhaps via the :command:`target_link_libraries` command, + to specify private link dependencies without other usage requirements. ``$`` Content of ``...`` when the property is exported using :command:`install(EXPORT)`, and empty otherwise. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index aaae457..bdf361e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3554,6 +3554,8 @@ void cmTarget::ExpandLinkItems(std::string const& prop, { cmGeneratorExpression ge; cmGeneratorExpressionDAGChecker dagChecker(this->GetName(), prop, 0, 0); + // The $ expression may be in a link interface to specify private + // link dependencies that are otherwise excluded from usage requirements. if(usage_requirements_only) { dagChecker.SetTransitivePropertiesOnly(); @@ -6077,18 +6079,8 @@ void cmTarget::GetTransitivePropertyTargets(const std::string& config, cmTarget const* headTarget, std::vector &tgts) const { - // The $ expression may be in a link interface to specify private - // link dependencies that are otherwise excluded from usage requirements. - // Currently $ is internal to CMake and only ever added by - // target_link_libraries for PRIVATE dependencies of STATIC libraries in - // INTERFACE_LINK_LIBRARIES which is used under CMP0022 NEW behavior. - bool usage_requir
[Cmake-commits] CMake branch, next, updated. v3.0.0-4262-g9cfdb3b
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 9cfdb3b3a43de0366b59c18ee1dc86a24299eefd (commit) via 5e01ee2ea9b2062969710d8eed00620bbfc61608 (commit) from 1a1cd48d9ca07d15b854bccdf81150c50ce4a3fc (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cfdb3b3a43de0366b59c18ee1dc86a24299eefd commit 9cfdb3b3a43de0366b59c18ee1dc86a24299eefd Merge: 1a1cd48 5e01ee2 Author: Clinton Stimpson AuthorDate: Tue Jul 15 13:19:19 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 13:19:19 2014 -0400 Merge topic 'encoding-ctest-fixes' into next 5e01ee2e Encoding: Fix a few encoding problems with ctest. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e01ee2ea9b2062969710d8eed00620bbfc61608 commit 5e01ee2ea9b2062969710d8eed00620bbfc61608 Author: Clinton Stimpson AuthorDate: Tue Jul 15 11:11:18 2014 -0600 Commit: Clinton Stimpson CommitDate: Tue Jul 15 11:12:57 2014 -0600 Encoding: Fix a few encoding problems with ctest. This also fixes some test failures on Windows when the name of the build directory contains non-ascii characters. diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 7c72cba..109905c 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -225,8 +225,8 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix, std::string upload_as = url + "/" + remoteprefix + cmSystemTools::GetFilenameName(*file); - struct stat st; - if ( ::stat(local_file.c_str(), &st) ) + + if ( !cmSystemTools::FileExists(local_file.c_str()) ) { cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find file: " << local_file << std::endl); @@ -234,6 +234,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix, ::curl_global_cleanup(); return false; } + unsigned long filelen = cmSystemTools::FileLength(local_file.c_str()); ftpfile = cmsys::SystemTools::Fopen(local_file.c_str(), "rb"); *this->LogFile << "\tUpload file: " << local_file << " to " @@ -252,7 +253,7 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix, // and give the size of the upload (optional) ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, -static_cast(st.st_size)); +static_cast(filelen)); // and give curl the buffer for errors ::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer); @@ -466,8 +467,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, upload_as += md5; } - struct stat st; - if ( ::stat(local_file.c_str(), &st) ) + if( !cmSystemTools::FileExists(local_file.c_str()) ) { cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find file: " << local_file << std::endl); @@ -475,11 +475,12 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, ::curl_global_cleanup(); return false; } + unsigned long filelen = cmSystemTools::FileLength(local_file.c_str()); ftpfile = cmsys::SystemTools::Fopen(local_file.c_str(), "rb"); cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, " Upload file: " << local_file << " to " -<< upload_as << " Size: " << st.st_size << std::endl); +<< upload_as << " Size: " << filelen << std::endl); // specify target ::curl_easy_setopt(curl,CURLOPT_URL, upload_as.c_str()); @@ -489,7 +490,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, // and give the size of the upload (optional) ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, -static_cast(st.st_size)); +static_cast(filelen)); // and give curl the buffer for errors ::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer); diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in index 55a34e3..fd8a2a8 100644 --- a/Tests/CTestTestMemcheck/memtester.cxx.in +++ b/Tests/CTestTestMemcheck/memtester.cxx.in @@ -1,11 +1,18 @@ #include +#include #include #define RETVAL @_retval@ int -main(int argc, char **argv) +main(int ac, char **av) { + setlocale(LC_CTYPE, ""); + cmsys::Encoding::CommandLineArguments args = +cmsys::Encoding::CommandLineArguments::Main(ac, av); + int argc = args.argc(); + const char* const* argv = args.argv(); + std::string exename = argv[0]; std::string logarg; bool
[Cmake-commits] CMake branch, next, updated. v3.0.0-4260-g1a1cd48
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 1a1cd48d9ca07d15b854bccdf81150c50ce4a3fc (commit) via 49bf3e7d8daab2a1e7ba435d011618bd2c516766 (commit) via 41fc00820ac5c61265a889dc15021fb2d26fe56f (commit) via c005d9566226f15368af7d772734265fe8916289 (commit) via 29abb3dedb7eca410083ee1e5424fddd24b1d4d6 (commit) via d3076b1d51c25f076d3dbde7d94e06078040f124 (commit) via 0bbebd3ca1f5e5dbf68444918d0ea1acc48cb776 (commit) from f49799e996088f1bab6828be8df5ad818f45762e (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a1cd48d9ca07d15b854bccdf81150c50ce4a3fc commit 1a1cd48d9ca07d15b854bccdf81150c50ce4a3fc Merge: f49799e 49bf3e7 Author: Brad King AuthorDate: Tue Jul 15 10:50:08 2014 -0400 Commit: Brad King CommitDate: Tue Jul 15 10:50:08 2014 -0400 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.0.0-1391-gc005d95
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 c005d9566226f15368af7d772734265fe8916289 (commit) via 43a8c5526d12c1346793ced5a4be85b9e9a3d695 (commit) via 9270aa9a2d1ea05e7bd63ef5214f4fbaafd14d2e (commit) from 29abb3dedb7eca410083ee1e5424fddd24b1d4d6 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c005d9566226f15368af7d772734265fe8916289 commit c005d9566226f15368af7d772734265fe8916289 Merge: 29abb3d 43a8c55 Author: Brad King AuthorDate: Tue Jul 15 10:48:18 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:18 2014 -0400 Merge topic 'dev/ison-isoff-performance' 43a8c552 SystemTools: Use a set in Is{On,Off} 9270aa9a IsOff: Use the length for the string construction --- Summary of changes: Source/cmSystemTools.cxx | 42 -- 1 file changed, 36 insertions(+), 6 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.0.0-1398-g49bf3e7
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 49bf3e7d8daab2a1e7ba435d011618bd2c516766 (commit) via 8a205b980c8dc088aa2c9f91adb90d57a65fa560 (commit) via d57be904ae997e44ec9ac3b44722277f81936577 (commit) via b3b44d138e50b2c5b4a4d327aae9290dba56862d (commit) via 80cb12bb8bc14eb3e56f344d03254777351e5c74 (commit) from 41fc00820ac5c61265a889dc15021fb2d26fe56f (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49bf3e7d8daab2a1e7ba435d011618bd2c516766 commit 49bf3e7d8daab2a1e7ba435d011618bd2c516766 Merge: 41fc008 8a205b9 Author: Brad King AuthorDate: Tue Jul 15 10:48:22 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:22 2014 -0400 Merge topic 'target-legacy-depends-only-for-vs6' 8a205b98 cmTarget: Compile old-style link dependencies only for VS 6 d57be904 cmTarget: Run old-style link dependencies only for VS 6 b3b44d13 cmTarget: Rename old-style link dependencies code as "ForVS6" 80cb12bb export_library_dependencies: Use original link libraries internally --- Summary of changes: Source/cmExportLibraryDependenciesCommand.cxx | 10 ++- Source/cmGlobalGenerator.h|5 ++ Source/cmGlobalVisualStudio6Generator.h |2 + Source/cmLocalVisualStudio6Generator.cxx |3 +- Source/cmTarget.cxx | 91 ++--- Source/cmTarget.h | 45 ++-- 6 files changed, 90 insertions(+), 66 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.0.0-1393-g41fc008
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 41fc00820ac5c61265a889dc15021fb2d26fe56f (commit) via 6c8364e6cbda7e890eb185b4ca327286ba63e1fb (commit) from c005d9566226f15368af7d772734265fe8916289 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41fc00820ac5c61265a889dc15021fb2d26fe56f commit 41fc00820ac5c61265a889dc15021fb2d26fe56f Merge: c005d95 6c8364e Author: Brad King AuthorDate: Tue Jul 15 10:48:20 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:20 2014 -0400 Merge topic 'FindCurses-overhaul' 6c8364e6 FindCurses: Overhaul Curses and NCurses search logic (#15011) --- Summary of changes: Modules/FindCurses.cmake | 177 +- 1 file changed, 98 insertions(+), 79 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.0.0-1388-g29abb3d
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 29abb3dedb7eca410083ee1e5424fddd24b1d4d6 (commit) via 4b139169702dec37039869cc4af064c18e6789b8 (commit) from d3076b1d51c25f076d3dbde7d94e06078040f124 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29abb3dedb7eca410083ee1e5424fddd24b1d4d6 commit 29abb3dedb7eca410083ee1e5424fddd24b1d4d6 Merge: d3076b1 4b13916 Author: Brad King AuthorDate: Tue Jul 15 10:48:17 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:17 2014 -0400 Merge topic 'dev/fix-cmake-rule-property' 4b139169 cmMakefile: fix __CMAKE_RULE property setting --- Summary of changes: Source/cmMakefile.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, master, updated. v3.0.0-1386-gd3076b1
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 d3076b1d51c25f076d3dbde7d94e06078040f124 (commit) via 90245fe86e4c5810034b5ac793609c2ecbfa07b8 (commit) from 0bbebd3ca1f5e5dbf68444918d0ea1acc48cb776 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3076b1d51c25f076d3dbde7d94e06078040f124 commit d3076b1d51c25f076d3dbde7d94e06078040f124 Merge: 0bbebd3 90245fe Author: Brad King AuthorDate: Tue Jul 15 10:48:15 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:15 2014 -0400 Merge topic 'FindImageMagick-pkgconfig' 90245fe8 FindImageMagick: Use pkgconfig hints if available (#14012) --- Summary of changes: Modules/FindImageMagick.cmake | 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, master, updated. v3.0.0-1384-g0bbebd3
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 0bbebd3ca1f5e5dbf68444918d0ea1acc48cb776 (commit) via 0fee3f471204dd9cd47682590bf9f15da456183a (commit) from 7bc84502513febf4e5e974f3d4285baa53f0afb9 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bbebd3ca1f5e5dbf68444918d0ea1acc48cb776 commit 0bbebd3ca1f5e5dbf68444918d0ea1acc48cb776 Merge: 7bc8450 0fee3f4 Author: Brad King AuthorDate: Tue Jul 15 10:48:13 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 10:48:13 2014 -0400 Merge topic 'doc-package-target-import-once' 0fee3f47 Revert "Help: Update cmake-packages.7 examples to import targets only once" --- Summary of changes: Help/manual/cmake-packages.7.rst | 15 --- 1 file changed, 4 insertions(+), 11 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.0.0-4253-gf49799e
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 f49799e996088f1bab6828be8df5ad818f45762e (commit) via e475c067c5f738d46cd28ce1a0cf03f7404590d8 (commit) via 7bc84502513febf4e5e974f3d4285baa53f0afb9 (commit) from 2fbe31fab2ec28c42c9bee918653f3501500aca8 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f49799e996088f1bab6828be8df5ad818f45762e commit f49799e996088f1bab6828be8df5ad818f45762e Merge: 2fbe31f e475c06 Author: Daniele E. Domenichelli AuthorDate: Tue Jul 15 09:14:12 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 09:14:12 2014 -0400 Merge topic 'fix_Xcode_generator_name' into next e475c067 Fix Xcode generator name 7bc84502 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e475c067c5f738d46cd28ce1a0cf03f7404590d8 commit e475c067c5f738d46cd28ce1a0cf03f7404590d8 Author: Daniele E. Domenichelli AuthorDate: Tue Jul 15 10:45:53 2014 +0200 Commit: Daniele E. Domenichelli CommitDate: Tue Jul 15 10:46:34 2014 +0200 Fix Xcode generator name The generator name is "Xcode", not "XCode" diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index dc4f894..d25986b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -77,7 +77,7 @@ if(BUILD_TESTING) # some old versions of make simply cannot handle spaces in paths if (MAKE_IS_GNU OR CMAKE_MAKE_PROGRAM MATCHES "nmake|gmake|wmake" OR - CMAKE_GENERATOR MATCHES "Visual Studio|XCode|Borland") + CMAKE_GENERATOR MATCHES "Visual Studio|Xcode|Borland") set(MAKE_SUPPORTS_SPACES 1) else() set(MAKE_SUPPORTS_SPACES 0) diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake index f74d17e..145d312 100644 --- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake +++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake @@ -1,7 +1,7 @@ include(RunCMake) run_cmake(CommandConflict) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}" MATCHES "XCode" ) +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}" MATCHES "Xcode" ) run_cmake(OutputConflict) endif() run_cmake(EmptyCondition1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- Tests/CMakeLists.txt|2 +- Tests/RunCMake/File_Generate/RunCMakeTest.cmake |2 +- 3 files changed, 3 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, next, updated. v3.0.0-4250-g2fbe31f
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 2fbe31fab2ec28c42c9bee918653f3501500aca8 (commit) via dc6826633c42978521d742216e84aadca94f1729 (commit) from 105bf85d309190e34eb31c2beba3cf52dc3a5252 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fbe31fab2ec28c42c9bee918653f3501500aca8 commit 2fbe31fab2ec28c42c9bee918653f3501500aca8 Merge: 105bf85 dc68266 Author: Stephen Kelly AuthorDate: Tue Jul 15 09:11:36 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 09:11:36 2014 -0400 Merge topic 'fix-QCC-compile-flags' into next dc682663 QNX: Add missing flags for configurations and artifact creation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc6826633c42978521d742216e84aadca94f1729 commit dc6826633c42978521d742216e84aadca94f1729 Author: Stephen Kelly AuthorDate: Tue Jul 15 11:01:36 2014 +0200 Commit: Stephen Kelly CommitDate: Tue Jul 15 15:10:53 2014 +0200 QNX: Add missing flags for configurations and artifact creation. Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add the missing pieces of the __compiler_gnu macro to the __compiler_qcc macro. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index cc551bd..ce7eb8a 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -25,11 +25,28 @@ macro(__compiler_qcc lang) set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-Wp,-isystem,") set(CMAKE_DEPFILE_FLAGS_${lang} "-Wc,-MMD,,-MT,,-MF,") - if (lang STREQUAL CXX) + set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") + set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=") + + # Initial configuration flags. + set(CMAKE_${lang}_FLAGS_INIT "") + set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") + set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") + set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") + set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") + + if (${lang} STREQUAL CXX) # If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the # default for the driver is not c++. set(CMAKE_CXX_COMPILE_OBJECT " -lang-c++ -o -c ") + +set(CMAKE_CXX_LINK_EXECUTABLE + " -lang-c++ -o ") + +set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() endmacro() --- 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.0.0-4248-g105bf85
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 105bf85d309190e34eb31c2beba3cf52dc3a5252 (commit) via 0fee3f471204dd9cd47682590bf9f15da456183a (commit) from a42edc6661a8f9a6616a12c83ba9eaff5bfcea65 (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=105bf85d309190e34eb31c2beba3cf52dc3a5252 commit 105bf85d309190e34eb31c2beba3cf52dc3a5252 Merge: a42edc6 0fee3f4 Author: Brad King AuthorDate: Tue Jul 15 08:59:11 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 08:59:11 2014 -0400 Merge topic 'doc-package-target-import-once' into next 0fee3f47 Revert "Help: Update cmake-packages.7 examples to import targets only once" http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fee3f471204dd9cd47682590bf9f15da456183a commit 0fee3f471204dd9cd47682590bf9f15da456183a Author: Brad King AuthorDate: Tue Jul 15 08:58:52 2014 -0400 Commit: Brad King CommitDate: Tue Jul 15 08:59:11 2014 -0400 Revert "Help: Update cmake-packages.7 examples to import targets only once" This reverts commit cfab942e5ff8463f8053564e68179da110280b43. Since commit v2.8.11~362^2 (Generate an early-return guard in target Export files, 2012-11-30) an external include guard is not needed. diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index 5badd48..c4cca6d 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -385,12 +385,9 @@ In this case, the ``ClimbingStatsConfig.cmake`` file could be as simple as: .. code-block:: cmake - if(NOT TARGET Upstream::ClimbingStats) -include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") - endif() + include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") -This allows downstreams to use the ``IMPORTED`` targets, and guards -against importing the targets more than once. If any macros +As this allows downstreams to use the ``IMPORTED`` targets. If any macros should be provided by the ``ClimbingStats`` package, they should be in a separate file which is installed to the same location as the ``ClimbingStatsConfig.cmake`` file, and included from there. @@ -457,9 +454,7 @@ dependencies of a package should be found in the ``Config.cmake`` file: include(CMakeFindDependencyMacro) find_dependency(Stats 2.6.4) - if(NOT TARGET Upstream::ClimbingStats) -include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") - endif() + include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake") The ``find_dependency`` macro also sets ``ClimbingStats_FOUND`` to ``False`` if @@ -476,9 +471,7 @@ be true. This can be tested with logic in the package configuration file: include(CMakeFindDependencyMacro) find_dependency(Stats 2.6.4) - if(NOT TARGET Upstream::ClimbingStats) -include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") - endif() + include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake") set(_supported_components Plot Table) --- Summary of changes: Help/manual/cmake-packages.7.rst | 15 --- 1 file changed, 4 insertions(+), 11 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.0.0-4246-ga42edc6
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 a42edc6661a8f9a6616a12c83ba9eaff5bfcea65 (commit) via ba858aa50c223980b94e9d78b41a1d315bb4d68c (commit) from ddd524eeba6310b556339471a6830469843d836b (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 - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a42edc6661a8f9a6616a12c83ba9eaff5bfcea65 commit a42edc6661a8f9a6616a12c83ba9eaff5bfcea65 Merge: ddd524e ba858aa Author: Stephen Kelly AuthorDate: Tue Jul 15 05:35:45 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Jul 15 05:35:45 2014 -0400 Merge topic 'fix-QCC-compile-flags' into next ba858aa5 QNX: Add missing flags for configurations and artifact creation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba858aa50c223980b94e9d78b41a1d315bb4d68c commit ba858aa50c223980b94e9d78b41a1d315bb4d68c Author: Stephen Kelly AuthorDate: Tue Jul 15 11:01:36 2014 +0200 Commit: Stephen Kelly CommitDate: Tue Jul 15 11:34:35 2014 +0200 QNX: Add missing flags for configurations and artifact creation. Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add the missing pieces of the __compiler_gnu macro to the __compiler_qcc macro. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index cc551bd..ce7eb8a 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -25,11 +25,28 @@ macro(__compiler_qcc lang) set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-Wp,-isystem,") set(CMAKE_DEPFILE_FLAGS_${lang} "-Wc,-MMD,,-MT,,-MF,") - if (lang STREQUAL CXX) + set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") + set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=") + + # Initial configuration flags. + set(CMAKE_${lang}_FLAGS_INIT "") + set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") + set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") + set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") + set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") + + if (${lang} STREQUAL CXX) # If the toolchain uses qcc for CMAKE_CXX_COMPILER instead of QCC, the # default for the driver is not c++. set(CMAKE_CXX_COMPILE_OBJECT " -lang-c++ -o -c ") + +set(CMAKE_CXX_LINK_EXECUTABLE + " -lang-c++ -o ") + +set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() endmacro() --- Summary of changes: Modules/Platform/QNX.cmake | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits