[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-703-gc9d13f8
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 c9d13f841e5ce58ac158e4b5e35b619c0bc7aaab (commit) from 5265a5dc2aa5b870ad6b85b7ffe2a831c6dba0d9 (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=c9d13f841e5ce58ac158e4b5e35b619c0bc7aaab commit c9d13f841e5ce58ac158e4b5e35b619c0bc7aaab Author: Kitware Robot AuthorDate: Fri Apr 18 00:01:15 2014 -0400 Commit: Kitware Robot CommitDate: Fri Apr 18 00:01:15 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 6ac332b..ce5f6ba 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 20140417) +set(CMake_VERSION_PATCH 20140418) #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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2471-gd53b4a9
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 d53b4a98b323196929d80b5bd88c114fca0fd6f3 (commit) via 3de4c2956539a4251b65b88bff477d5866e98510 (commit) from 5528d015f2ba96790ed399500f4f050a80e7d5dc (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=d53b4a98b323196929d80b5bd88c114fca0fd6f3 commit d53b4a98b323196929d80b5bd88c114fca0fd6f3 Merge: 5528d01 3de4c29 Author: Brad King AuthorDate: Thu Apr 17 11:27:14 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 11:27:14 2014 -0400 Merge topic 'internal-error-backtrace' into next 3de4c295 cmake: Print C++ stack trace after INTERNAL_ERROR messages http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3de4c2956539a4251b65b88bff477d5866e98510 commit 3de4c2956539a4251b65b88bff477d5866e98510 Author: Brad King AuthorDate: Thu Apr 17 11:20:13 2014 -0400 Commit: Brad King CommitDate: Thu Apr 17 11:25:19 2014 -0400 cmake: Print C++ stack trace after INTERNAL_ERROR messages Since an INTERNAL_ERROR is always a bug, it will be useful to have the program stack trace available in the report. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 71ea3f5..7aada4b 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -24,6 +24,7 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmGraphVizWriter.h" # include "cmVariableWatch.h" +# include #endif #include @@ -2601,6 +2602,22 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text, // Add a terminating blank line. msg << "\n"; +#if defined(CMAKE_BUILD_WITH_CMAKE) + // Add a C++ stack trace to internal errors. + if(t == cmake::INTERNAL_ERROR) +{ +std::string stack = cmsys::SystemInformation::GetProgramStack(0,0); +if(!stack.empty()) + { + if(cmHasLiteralPrefix(stack, "WARNING:")) +{ +stack = "Note:" + stack.substr(8); +} + msg << stack << "\n"; + } +} +#endif + // Output the message. if(isError) { --- Summary of changes: Source/cmake.cxx | 17 + 1 file changed, 17 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2466-ga1c0767
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 a1c076704cd0a71533b542c271ea9fa560ba8c37 (commit) via 8d0b1ccac13389255a318422d38b246cf47d9ace (commit) via 447fbb3facd09a29a2a402df258acf01cbf0bc34 (commit) from 77e71facd18fda4ca071d243e470d02eca2cc71f (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=a1c076704cd0a71533b542c271ea9fa560ba8c37 commit a1c076704cd0a71533b542c271ea9fa560ba8c37 Merge: 77e71fa 8d0b1cc Author: Stephen Kelly AuthorDate: Thu Apr 17 10:21:41 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 10:21:41 2014 -0400 Merge topic 'feature-absence-hard-error' into next 8d0b1cca Features: FATAL_ERROR on compilers with no recorded features. 447fbb3f Tests: Execute compile features tests unconditionally. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d0b1ccac13389255a318422d38b246cf47d9ace commit 8d0b1ccac13389255a318422d38b246cf47d9ace Author: Stephen Kelly AuthorDate: Tue Apr 15 18:09:21 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 16:20:50 2014 +0200 Features: FATAL_ERROR on compilers with no recorded features. Users of the new target_compile_features command are expected to check the existence of the CMAKE_CXX_COMPILE_FEATURES variable before attempting to use it to require features. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6ec40fb..07cfe12 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4604,8 +4604,28 @@ AddRequiredTargetFeature(cmTarget *target, const std::string& feature, if (!featuresKnown || !*featuresKnown) { -// We know of no features for the compiler at all. -return true; +cmOStringStream e; +if (error) + { + e << "no"; + } +else + { + e << "No"; + } +e << " known features for compiler\n\"" + << this->GetDefinition("CMAKE_" + lang + "_COMPILER_ID") + << "\"\nversion " + << this->GetDefinition("CMAKE_" + lang + "_COMPILER_VERSION") << "."; +if (error) + { + *error = e.str(); + } +else + { + this->IssueMessage(cmake::FATAL_ERROR, e.str()); + } +return false; } std::vector availableFeatures; diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-result.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-result.txt new file mode 100644 index 000..d00491f --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt new file mode 100644 index 000..8b029ac --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt @@ -0,0 +1,8 @@ +CMake Error at NoSupportedCxxFeatures.cmake:3 \(target_compile_features\): + target_compile_features no known features for compiler + + "[^"]*" + + version *[.0-9]+\. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures.cmake b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures.cmake new file mode 100644 index 000..5121948 --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures.cmake @@ -0,0 +1,3 @@ + +add_library(no_features empty.cpp) +target_compile_features(no_features PRIVATE cxx_constexpr) diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-result.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-result.txt new file mode 100644 index 000..d00491f --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt new file mode 100644 index 000..d8366b2 --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + No known features for compiler + + "[^"]*" + + version *[.0-9]+\. diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex.cmake b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex.cmake new file mode 100644 index 000..490f187 --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex.cmake @@ -0,0 +1,3 @@ + +add_library(no_features empty.cpp) +target_compile_features(no_features PRIVATE $<1:cxx_constexpr>) diff --git a/Tests/RunCMake/CompileFeatures/RunCMak
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2463-g77e71fa
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 77e71facd18fda4ca071d243e470d02eca2cc71f (commit) via ccd29b9af849316a9361ceb8d0addb24e7158382 (commit) from a2cb652451fcceb2eb545c3a2ddca08f55cdec93 (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=77e71facd18fda4ca071d243e470d02eca2cc71f commit 77e71facd18fda4ca071d243e470d02eca2cc71f Merge: a2cb652 ccd29b9 Author: Brad King AuthorDate: Thu Apr 17 09:54:00 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:54:00 2014 -0400 Merge topic 'ExternalData-missing-not-fatal' into next ccd29b9a ExternalData: Warn on missing file instead of failing http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccd29b9af849316a9361ceb8d0addb24e7158382 commit ccd29b9af849316a9361ceb8d0addb24e7158382 Author: Brad King AuthorDate: Thu Apr 17 09:31:41 2014 -0400 Commit: Brad King CommitDate: Thu Apr 17 09:45:09 2014 -0400 ExternalData: Warn on missing file instead of failing When the primary source tree path named by a DATA{} reference does not exist, produce an AUTHOR_WARNING instead of a FATAL_ERROR. This is useful when writing a new DATA{} reference to a test reference output that has not been created yet. This way the developer can run the test, manually verify the output, and then copy it into place to provide the reference and eliminate the warning. If the named source tree path is expected to be a file but exists as a directory, we still need to produce a FATAL_ERROR. diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake index ee20693..73a4990 100644 --- a/Modules/ExternalData.cmake +++ b/Modules/ExternalData.cmake @@ -421,6 +421,7 @@ function(_ExternalData_arg target arg options var_file) set(external "") # Entries external to the source tree. set(internal "") # Entries internal to the source tree. set(have_original ${data_is_directory}) + set(have_original_as_dir 0) # Process options. set(series_option "") @@ -470,11 +471,18 @@ function(_ExternalData_arg target arg options var_file) endif() if(NOT have_original) -message(FATAL_ERROR "Data file referenced by argument\n" +if(have_original_as_dir) + set(msg_kind FATAL_ERROR) + set(msg "that is directory instead of a file!") +else() + set(msg_kind AUTHOR_WARNING) + set(msg "that does not exist as a file (with or without an extension)!") +endif() +message(${msg_kind} "Data file referenced by argument\n" " ${arg}\n" "corresponds to source tree path\n" " ${reldata}\n" - "that does not exist as a file (with or without an extension)!") + "${msg}") endif() if(external) @@ -591,27 +599,33 @@ function(_ExternalData_arg_find_files pattern regex) set(alg "") endif() if("x${relname}" MATCHES "^x${regex}$" # matches -AND NOT IS_DIRECTORY "${top_src}/${entry}" # not a directory AND NOT "x${relname}" MATCHES "(^x|/)\\.ExternalData_" # not staged obj ) - set(name "${top_src}/${relname}") - set(file "${top_bin}/${relname}") - if(alg) -list(APPEND external "${file}|${name}|${alg}") - elseif(ExternalData_LINK_CONTENT) -_ExternalData_link_content("${name}" alg) -list(APPEND external "${file}|${name}|${alg}") - elseif(NOT top_same) -list(APPEND internal "${file}|${name}") - endif() - if("${relname}" STREQUAL "${reldata}") -set(have_original 1) + if(IS_DIRECTORY "${top_src}/${entry}") +if("${relname}" STREQUAL "${reldata}") + set(have_original_as_dir 1) +endif() + else() +set(name "${top_src}/${relname}") +set(file "${top_bin}/${relname}") +if(alg) + list(APPEND external "${file}|${name}|${alg}") +elseif(ExternalData_LINK_CONTENT) + _ExternalData_link_content("${name}" alg) + list(APPEND external "${file}|${name}|${alg}") +elseif(NOT top_same) + list(APPEND internal "${file}|${name}") +endif() +if("${relname}" STREQUAL "${reldata}") + set(have_original 1) +endif() endif() endif() endforeach() set(external "${external}" PARENT_SCOPE) set(internal "${internal}" PARENT_SCOPE) set(have_original "${have_original}" PARENT_SCOPE) + set(have_original_as_dir "${have_original_as_dir}" PARENT_SCOPE) endfunction() #- diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/
[Cmake-commits] CMake branch, release, updated. v3.0.0-rc3-24-ge40fbbb
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, release has been updated via e40fbbb0744e63401cba0958155c14fa838477cb (commit) via ac00baa6a84c2ee759d05a602d775bda6508ee06 (commit) via b508de59e852a5068f3b9838e2be8a485235b934 (commit) via cc57ff5c496e280d93a842909d2c739cfbb5ba93 (commit) from 1c5871984a33922e3ec229ba28bacf0848e9b003 (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 - --- Summary of changes: Modules/Platform/UnixPaths.cmake |2 +- Source/cmArchiveWrite.cxx| 35 +-- 2 files changed, 22 insertions(+), 15 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2461-ga2cb652
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 a2cb652451fcceb2eb545c3a2ddca08f55cdec93 (commit) via 5265a5dc2aa5b870ad6b85b7ffe2a831c6dba0d9 (commit) from b4da1527abc69889d23d259a66753bdc1bf6fcb0 (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=a2cb652451fcceb2eb545c3a2ddca08f55cdec93 commit a2cb652451fcceb2eb545c3a2ddca08f55cdec93 Merge: b4da152 5265a5d Author: Brad King AuthorDate: Thu Apr 17 09:18:36 2014 -0400 Commit: Brad King CommitDate: Thu Apr 17 09:18:36 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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-702-g5265a5d
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 5265a5dc2aa5b870ad6b85b7ffe2a831c6dba0d9 (commit) via e40fbbb0744e63401cba0958155c14fa838477cb (commit) via ac00baa6a84c2ee759d05a602d775bda6508ee06 (commit) from 2fca2b23107c1e57116cea0dad6c4f9dd9c0c146 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2459-gb4da152
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 b4da1527abc69889d23d259a66753bdc1bf6fcb0 (commit) via 2fca2b23107c1e57116cea0dad6c4f9dd9c0c146 (commit) via 51a8a37443ce491c871702721ba2a69de3bf (commit) via fe27c993ff18af1c02c2937b6474d021cc385293 (commit) via 7a36a34a65351dc6a1cda622d129d3fcf1b28eeb (commit) via d9e2cd258cf96087fffc2fba3321200ce1e19a58 (commit) via 4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb (commit) via 41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa (commit) via c14010e4ea65d25e0b511ac7fd1d767c2b0b7d34 (commit) via ef10fc47ae07a61ff560c88f768113ed157757f2 (commit) via 858ed4b390fd21ee1cc29bced6724d2eeb4476a6 (commit) from 2baba2a1b9476beae3ab81ca1ec5cb3209054f97 (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=b4da1527abc69889d23d259a66753bdc1bf6fcb0 commit b4da1527abc69889d23d259a66753bdc1bf6fcb0 Merge: 2baba2a 2fca2b2 Author: Brad King AuthorDate: Thu Apr 17 09:12:47 2014 -0400 Commit: Brad King CommitDate: Thu Apr 17 09:12:47 2014 -0400 Merge branch 'master' into next --- 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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-695-g51a8a37
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 51a8a37443ce491c871702721ba2a69de3bf (commit) via 1f3e95ba72cdafec0efb99d43a062b538780b093 (commit) from fe27c993ff18af1c02c2937b6474d021cc385293 (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=51a8a37443ce491c871702721ba2a69de3bf commit 51a8a37443ce491c871702721ba2a69de3bf Merge: fe27c99 1f3e95b Author: Brad King AuthorDate: Thu Apr 17 09:11:08 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:08 2014 -0400 Merge topic 'FindGTest-typed-test' 1f3e95ba FindGTest: Teach GTEST_ADD_TESTS about TYPED_TEST --- Summary of changes: Modules/FindGTest.cmake | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-683-gd9e2cd2
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 d9e2cd258cf96087fffc2fba3321200ce1e19a58 (commit) via c8e565a06e229e1524df01d965c8b7e7a757ce05 (commit) from 4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb (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=d9e2cd258cf96087fffc2fba3321200ce1e19a58 commit d9e2cd258cf96087fffc2fba3321200ce1e19a58 Merge: 4c966d9 c8e565a Author: Brad King AuthorDate: Thu Apr 17 09:11:03 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:03 2014 -0400 Merge topic 'codelite-simplify' c8e565a0 CodeLite generator: simplify code a bit --- Summary of changes: Source/cmExtraCodeLiteGenerator.cxx | 12 1 file changed, 4 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-679-g41c76d5
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 41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa (commit) via 1ec6485c6a16c230bf29696ab8fd48eb5edbb78a (commit) from c14010e4ea65d25e0b511ac7fd1d767c2b0b7d34 (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=41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa commit 41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa Merge: c14010e 1ec6485 Author: Brad King AuthorDate: Thu Apr 17 09:10:59 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:10:59 2014 -0400 Merge topic 'ar-no-replace' 1ec6485c Support duplicate object names in large archives (#14874) --- Summary of changes: Modules/CMakeCInformation.cmake |4 ++-- Modules/CMakeCXXInformation.cmake |4 ++-- Modules/CMakeFortranInformation.cmake |4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-693-gfe27c99
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 fe27c993ff18af1c02c2937b6474d021cc385293 (commit) via 67f5f0a9fd012f3da7cadf653102671a8f316718 (commit) via fcfbb0a9244ff52d03fec67de7a2a8d0ff406db3 (commit) via 61a649d974b7810ec6073ef088e1b65c1277dbda (commit) via 4533560c23adf29a03d57b5c5678048795ed6134 (commit) via 44d6b82f4351dc3941fd9794ad8f3909148c0314 (commit) via 37f225b72c8e4c440025a98f68eda9914f7ba5f7 (commit) via 6ab7c326485b4af46a4e45faef2ac7d469df8840 (commit) from 7a36a34a65351dc6a1cda622d129d3fcf1b28eeb (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=fe27c993ff18af1c02c2937b6474d021cc385293 commit fe27c993ff18af1c02c2937b6474d021cc385293 Merge: 7a36a34 67f5f0a Author: Brad King AuthorDate: Thu Apr 17 09:11:06 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:06 2014 -0400 Merge topic 'update-libarchive' 67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it 61a649d9 libarchive: Update README-CMake.txt for new snapshot 4533560c Merge branch 'libarchive-upstream' into update-libarchive 44d6b82f libarchive: Disable all whitespace checks in third-party code 37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced) 6ab7c326 libarchive: Avoid left-shift overflow of signed integer --- Summary of changes: Utilities/cmlibarchive/.gitattributes |2 +- Utilities/cmlibarchive/CMakeLists.txt |1 + Utilities/cmlibarchive/README-CMake.txt|8 +- Utilities/cmlibarchive/build/cmake/config.h.in |3 + Utilities/cmlibarchive/libarchive/CMakeLists.txt |1 + .../cmlibarchive/libarchive/archive_read_extract.c | 134 ++-- ...hive_read_extract.c => archive_read_extract2.c} | 64 ++ .../cmlibarchive/libarchive/archive_read_private.h | 11 +- .../libarchive/archive_read_support_format_zip.c |9 +- .../libarchive/archive_write_disk_posix.c |3 +- .../libarchive/archive_write_set_format_zip.c | 34 ++--- 11 files changed, 69 insertions(+), 201 deletions(-) copy Utilities/cmlibarchive/libarchive/{archive_read_extract.c => archive_read_extract2.c} (71%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-699-g2fca2b2
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 2fca2b23107c1e57116cea0dad6c4f9dd9c0c146 (commit) via 3b673586f520cf87ae6a0a923a88ad9dadb80b52 (commit) via 5baa81592be69a87c10380daaa03da48c3fc729f (commit) via 9e0b3153fa2fa9e1b51d1fd7d265a114958e7f0a (commit) from 51a8a37443ce491c871702721ba2a69de3bf (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=2fca2b23107c1e57116cea0dad6c4f9dd9c0c146 commit 2fca2b23107c1e57116cea0dad6c4f9dd9c0c146 Merge: 51a8a37 3b67358 Author: Brad King AuthorDate: Thu Apr 17 09:11:10 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:10 2014 -0400 Merge topic 'fix-CMP0052' 3b673586 CMP0052: Make the warning message more informative. 5baa8159 CMP0052: Test that include dirs in install locations cause no warnings. 9e0b3153 CMP0052: Do not warn when include dir is not in source or build tree --- Summary of changes: Source/cmExportFileGenerator.cxx| 15 ++- .../BinInInstallPrefix-CMP0052-WARN-stderr.txt |5 + .../DirInInstallPrefix-result.txt} |0 .../DirInInstallPrefix-stderr.txt} |0 ...PrefixInInterface.cmake => DirInInstallPrefix.cmake} |6 ++ Tests/RunCMake/include_directories/RunCMakeTest.cmake |3 +++ .../SrcInInstallPrefix-CMP0052-WARN-stderr.txt |5 + 7 files changed, 25 insertions(+), 9 deletions(-) copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => include_directories/DirInInstallPrefix-result.txt} (100%) copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => include_directories/DirInInstallPrefix-stderr.txt} (100%) copy Tests/RunCMake/include_directories/{InstallPrefixInInterface.cmake => DirInInstallPrefix.cmake} (61%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-681-g4c966d9
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 4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb (commit) via 0d048384694b7285ef739153757b57791d4ebb93 (commit) from 41c76d5aeb86e082b3e3c093c960a4e7ce1f7faa (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=4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb commit 4c966d90c7a2afaffa97ae3d0d4fbc26b614a2eb Merge: 41c76d5 0d04838 Author: Brad King AuthorDate: Thu Apr 17 09:11:01 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:01 2014 -0400 Merge topic 'vs-use-full-paths' 0d048384 VS: Use full path to sources to allow deeper trees with VS >= 10 --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-685-g7a36a34
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 7a36a34a65351dc6a1cda622d129d3fcf1b28eeb (commit) via b84ee41abbea790ac93c012b1423ef012f933ca2 (commit) from d9e2cd258cf96087fffc2fba3321200ce1e19a58 (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=7a36a34a65351dc6a1cda622d129d3fcf1b28eeb commit 7a36a34a65351dc6a1cda622d129d3fcf1b28eeb Merge: d9e2cd2 b84ee41 Author: Brad King AuthorDate: Thu Apr 17 09:11:04 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:11:04 2014 -0400 Merge topic 'update-prebuilt-openssl' b84ee41a Utilities/Release: Update to openssl-1.0.1g --- Summary of changes: Utilities/Release/dashmacmini2_release.cmake |6 +++--- Utilities/Release/dashmacmini5_release.cmake |6 +++--- Utilities/Release/magrathea_release.cmake|6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-675-gef10fc4
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 ef10fc47ae07a61ff560c88f768113ed157757f2 (commit) via cc57ff5c496e280d93a842909d2c739cfbb5ba93 (commit) from 858ed4b390fd21ee1cc29bced6724d2eeb4476a6 (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=ef10fc47ae07a61ff560c88f768113ed157757f2 commit ef10fc47ae07a61ff560c88f768113ed157757f2 Merge: 858ed4b cc57ff5 Author: Brad King AuthorDate: Thu Apr 17 09:10:53 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:10:53 2014 -0400 Merge topic 'implicit-libNN-dirs' cc57ff5c Drop /lib32 and /lib64 from link directories and RPATH (#14875) --- Summary of changes: Modules/Platform/UnixPaths.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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-677-gc14010e
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 c14010e4ea65d25e0b511ac7fd1d767c2b0b7d34 (commit) via b508de59e852a5068f3b9838e2be8a485235b934 (commit) from ef10fc47ae07a61ff560c88f768113ed157757f2 (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=c14010e4ea65d25e0b511ac7fd1d767c2b0b7d34 commit c14010e4ea65d25e0b511ac7fd1d767c2b0b7d34 Merge: ef10fc4 b508de5 Author: Brad King AuthorDate: Thu Apr 17 09:10:56 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:10:56 2014 -0400 Merge topic 'archive-null-error' b508de59 cmArchiveWrite: Handle NULL error string (#14882) --- Summary of changes: Source/cmArchiveWrite.cxx | 35 +-- 1 file changed, 21 insertions(+), 14 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2448-g2baba2a
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 2baba2a1b9476beae3ab81ca1ec5cb3209054f97 (commit) via 3b673586f520cf87ae6a0a923a88ad9dadb80b52 (commit) via 5baa81592be69a87c10380daaa03da48c3fc729f (commit) from dea48fcc07f19ee261a4486a58f44b24b85d03f7 (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=2baba2a1b9476beae3ab81ca1ec5cb3209054f97 commit 2baba2a1b9476beae3ab81ca1ec5cb3209054f97 Merge: dea48fc 3b67358 Author: Brad King AuthorDate: Thu Apr 17 09:08:39 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:08:39 2014 -0400 Merge topic 'fix-CMP0052' into next 3b673586 CMP0052: Make the warning message more informative. 5baa8159 CMP0052: Test that include dirs in install locations cause no warnings. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b673586f520cf87ae6a0a923a88ad9dadb80b52 commit 3b673586f520cf87ae6a0a923a88ad9dadb80b52 Author: Stephen Kelly AuthorDate: Wed Apr 16 23:46:13 2014 +0200 Commit: Brad King CommitDate: Thu Apr 17 09:08:24 2014 -0400 CMP0052: Make the warning message more informative. Print the reason for the offending entry in the INTERFACE_INCLUDE_DIRECTORIES. diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 25ffe1a..2db4086 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -301,7 +301,10 @@ static bool checkInterfaceDirs(const std::string &prepro, s << "Directory:\n\"" << *li << "\"\nin " "INTERFACE_INCLUDE_DIRECTORIES of target \"" << target->GetName() << "\" is a subdirectory of the install " - "directory:\n\"" << installDir << "\""; + "directory:\n\"" << installDir << "\"\nhowever it is also " + "a subdirectory of the " << (inBinary ? "build" : "source") + << " tree:\n\"" << (inBinary ? topBinaryDir : topSourceDir) + << "\"" << std::endl; target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING, s.str()); } diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt index f6d408c..054bff5 100644 --- a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt +++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt @@ -12,4 +12,9 @@ CMake Warning \(dev\) in CMakeLists.txt: of the install directory: ".*Tests/RunCMake/include_directories/prefix" + + however it is also a subdirectory of the build tree: + + ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build" + This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt index 78710c0..0b13fd8 100644 --- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt +++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt @@ -12,4 +12,9 @@ CMake Warning \(dev\) in CMakeLists.txt: of the install directory: ".*Tests/RunCMake/include_directories/prefix" + + however it is also a subdirectory of the source tree: + + ".*Tests/RunCMake/include_directories/prefix/src" + This warning is for project developers. Use -Wno-dev to suppress it. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5baa81592be69a87c10380daaa03da48c3fc729f commit 5baa81592be69a87c10380daaa03da48c3fc729f Author: Stephen Kelly AuthorDate: Wed Apr 16 22:49:40 2014 +0200 Commit: Brad King CommitDate: Thu Apr 17 09:07:59 2014 -0400 CMP0052: Test that include dirs in install locations cause no warnings. diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt new file mode 100644 index 000..573541a --- /dev/null +++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt new file mode 100644 index 000..10f3293 --- /dev/null +++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefi
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2445-gdea48fc
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 dea48fcc07f19ee261a4486a58f44b24b85d03f7 (commit) via 817fd28e224678239410bb2334c708fdfea6ee7d (commit) from 10e7bdb453fb049f93a97deb9699a5f884f0f994 (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=dea48fcc07f19ee261a4486a58f44b24b85d03f7 commit dea48fcc07f19ee261a4486a58f44b24b85d03f7 Merge: 10e7bdb 817fd28 Author: Stephen Kelly AuthorDate: Thu Apr 17 09:01:27 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 09:01:27 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next 817fd28e Restore define. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=817fd28e224678239410bb2334c708fdfea6ee7d commit 817fd28e224678239410bb2334c708fdfea6ee7d Author: Stephen Kelly AuthorDate: Thu Apr 17 15:01:01 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 15:01:01 2014 +0200 Restore define. diff --git a/Modules/CMakeCXXCompilerId.h.in b/Modules/CMakeCXXCompilerId.h.in index e19a860..b02f29f 100644 --- a/Modules/CMakeCXXCompilerId.h.in +++ b/Modules/CMakeCXXCompilerId.h.in @@ -116,6 +116,7 @@ # define @PREFIX@COMPILER_VERSION_PATCH DEC(__HP_aCC % 100) #elif defined(__DECCXX) +# define @PREFIX@COMPILER_ID "Compaq" # define @PREFIX@COMPILER_IS_Compaq /* __DECCXX_VER = VVRRT */ # define @PREFIX@COMPILER_VERSION_MAJOR DEC(__DECCXX_VER/1000) --- Summary of changes: Modules/CMakeCXXCompilerId.h.in |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2443-g10e7bdb
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 10e7bdb453fb049f93a97deb9699a5f884f0f994 (commit) via 86bf91f508b814eeeb2ffcf691aa7be940fbbf89 (commit) from 80665095b16b061ee4116e222e5d97d56848e6f1 (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=10e7bdb453fb049f93a97deb9699a5f884f0f994 commit 10e7bdb453fb049f93a97deb9699a5f884f0f994 Merge: 8066509 86bf91f Author: Stephen Kelly AuthorDate: Thu Apr 17 08:57:03 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 08:57:03 2014 -0400 Merge topic 'feature-absence-hard-error' into next 86bf91f5 Rename test file. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86bf91f508b814eeeb2ffcf691aa7be940fbbf89 commit 86bf91f508b814eeeb2ffcf691aa7be940fbbf89 Author: Stephen Kelly AuthorDate: Thu Apr 17 14:56:13 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 14:56:13 2014 +0200 Rename test file. Don't overwrite dummy.cpp in the source on in-source build. diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt index f03f33d..62e3ce0 100644 --- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt +++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.0) project(target_compile_features) if (NOT CMAKE_CXX_COMPILE_FEATURES) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp" + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_dummy.cpp" "int main(int,char**) { return 0; }\n" ) - add_executable(target_compile_features "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp") + add_executable(target_compile_features "${CMAKE_CURRENT_BINARY_DIR}/test_dummy.cpp") return() endif() --- Summary of changes: Tests/CMakeCommands/target_compile_features/CMakeLists.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2437-gcac16dd
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 cac16dd76f57ecb89761921b0910645db4aefdc3 (commit) via 692228e41821a1af1f904304984c7366ae2ca288 (commit) via e5e9b8e9a33186c0684974a54507d07596d72a1b (commit) from 6205cf72201ba68504816c45c7ad49bebbfa5fa6 (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=cac16dd76f57ecb89761921b0910645db4aefdc3 commit cac16dd76f57ecb89761921b0910645db4aefdc3 Merge: 6205cf7 692228e Author: Stephen Kelly AuthorDate: Thu Apr 17 05:06:10 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 05:06:10 2014 -0400 Merge topic 'CMP0052-docs' into next 692228e4 Help: Link to cmake-buildsystem from CMP0052 docs. e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=692228e41821a1af1f904304984c7366ae2ca288 commit 692228e41821a1af1f904304984c7366ae2ca288 Author: Stephen Kelly AuthorDate: Thu Apr 17 11:05:20 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 11:05:20 2014 +0200 Help: Link to cmake-buildsystem from CMP0052 docs. diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst index f857f36..48cfc9c 100644 --- a/Help/policy/CMP0052.rst +++ b/Help/policy/CMP0052.rst @@ -10,6 +10,9 @@ the installation prefix. This makes the installation depend on the existence of the source dir or binary dir, and the installation will be broken if either are removed after installation. +See :ref:`Include Directories and Usage Requirements` for more on +specifying include directories for targets. + The OLD behavior for this policy is to export the content of the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` with the source or binary directory. The NEW behavior for this http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5e9b8e9a33186c0684974a54507d07596d72a1b commit e5e9b8e9a33186c0684974a54507d07596d72a1b Author: Stephen Kelly AuthorDate: Thu Apr 17 11:01:58 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 11:01:58 2014 +0200 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem. diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 501b924..3e1f011 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -580,7 +580,17 @@ and the install-tree. The ``BUILD_INTERFACE`` and ``INSTALL_INTERFACE`` generator expressions can be used to describe separate usage requirements based on the usage location. Relative paths are allowed within these expressions, and are interpreted relative to the current source directory -or the installation prefix, as appropriate. +or the installation prefix, as appropriate: + +.. code-block:: cmake + + add_library(ClimbingStats climbingstats.cpp) + target_include_directories(ClimbingStats INTERFACE +$ +$ +$ +$/$/generated> + ) Two convenience APIs are provided relating to include directories usage requirements. The :variable:`CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE` variable --- Summary of changes: Help/manual/cmake-buildsystem.7.rst | 12 +++- Help/policy/CMP0052.rst |3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2434-g6205cf7
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 6205cf72201ba68504816c45c7ad49bebbfa5fa6 (commit) via 91620404a8966bfa754c9b8d80bd5425fee2228b (commit) from 29dd119cf5166a7b9b4d10744ec92005b361cb5e (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=6205cf72201ba68504816c45c7ad49bebbfa5fa6 commit 6205cf72201ba68504816c45c7ad49bebbfa5fa6 Merge: 29dd119 9162040 Author: Stephen Kelly AuthorDate: Thu Apr 17 04:56:20 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Apr 17 04:56:20 2014 -0400 Merge topic 'autorcc-target-dir' into next 91620404 QtAutogen: Put generated qrc files in a target-specific dir. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91620404a8966bfa754c9b8d80bd5425fee2228b commit 91620404a8966bfa754c9b8d80bd5425fee2228b Author: Stephen Kelly AuthorDate: Thu Apr 17 10:50:50 2014 +0200 Commit: Stephen Kelly CommitDate: Thu Apr 17 10:54:56 2014 +0200 QtAutogen: Put generated qrc files in a target-specific dir. diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index b6f9791..602b065 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -16,6 +16,7 @@ set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_QT_VERSION_MAJOR "@_target_qt_version@") set(AM_TARGET_NAME @_moc_target_name@) +set(AM_ORIGIN_TARGET_NAME @_origin_target_name@) set(AM_RELAXED_MODE "@_moc_relaxed_mode@") set(AM_UIC_TARGET_OPTIONS @_uic_target_options@) set(AM_UIC_OPTIONS_FILES @_qt_uic_options_files@) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index ae11462..74326f3 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -367,6 +367,8 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget const* target) makefile->AddDefinition("_moc_target_name", cmLocalGenerator::EscapeForCMake(autogenTargetName).c_str()); + makefile->AddDefinition("_origin_target_name", + cmLocalGenerator::EscapeForCMake(target->GetName()).c_str()); std::string targetDir = getAutogenTargetDir(target); @@ -506,7 +508,7 @@ void cmQtAutoGenerators::SetupSourceFiles(cmTarget const* target) std::string basename = cmsys::SystemTools:: GetFilenameWithoutLastExtension(absFile); -std::string rcc_output_file = makefile->GetCurrentOutputDirectory(); +std::string rcc_output_file = target->GetSupportDirectory(); rcc_output_file += "/qrc_" + basename + ".cpp"; makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", rcc_output_file.c_str(), false); @@ -1063,6 +1065,8 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile, this->ProjectBinaryDir = makefile->GetSafeDefinition("AM_CMAKE_BINARY_DIR"); this->ProjectSourceDir = makefile->GetSafeDefinition("AM_CMAKE_SOURCE_DIR"); this->TargetName = makefile->GetSafeDefinition("AM_TARGET_NAME"); + this->OriginTargetName + = makefile->GetSafeDefinition("AM_ORIGIN_TARGET_NAME"); { const char *uicOptionsFiles @@ -2057,7 +2061,9 @@ bool cmQtAutoGenerators::GenerateQrc() std::string basename = cmsys::SystemTools:: GetFilenameWithoutLastExtension(*si); -std::string rcc_output_file = this->Builddir + "qrc_" + basename + ".cpp"; +std::string rcc_output_file = this->Builddir ++ "CMakeFiles/" + this->OriginTargetName ++ ".dir/qrc_" + basename + ".cpp"; int sourceNewerThanQrc = 0; bool success = cmsys::SystemTools::FileTimeCompare(si->c_str(), diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index 8003795..501e13a 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -104,6 +104,7 @@ private: std::string ProjectBinaryDir; std::string ProjectSourceDir; std::string TargetName; + std::string OriginTargetName; std::string CurrentCompileSettingsStr; std::string OldCompileSettingsStr; --- Summary of changes: Modules/AutogenInfo.cmake.in |1 + Source/cmQtAutoGenerators.cxx | 10 -- Source/cmQtAutoGenerators.h |1 + 3 files changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-