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 2bb14d7a833041209d3ea4350ea43243c1df1aee (commit) via ecdfeaf3bc0078084314e87ea267ded90694fdaf (commit) via 3a9f906dc9511353230432fb39e907f2de4b8d5a (commit) from 438debcf540ce492e3545e7535accd8d0ed94f54 (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=2bb14d7a833041209d3ea4350ea43243c1df1aee commit 2bb14d7a833041209d3ea4350ea43243c1df1aee Merge: 438debc ecdfeaf Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Apr 16 17:47:29 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 16 17:47:29 2014 -0400 Merge topic 'fix-CMP0052' into next ecdfeaf3 CMP0052: Make the warning message more informative. 3a9f906d Tests: Make sure include directories in install locations cause no warnings. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecdfeaf3bc0078084314e87ea267ded90694fdaf commit ecdfeaf3bc0078084314e87ea267ded90694fdaf Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Apr 16 23:46:13 2014 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Apr 16 23:46:13 2014 +0200 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=3a9f906dc9511353230432fb39e907f2de4b8d5a commit 3a9f906dc9511353230432fb39e907f2de4b8d5a Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Wed Apr 16 22:49:40 2014 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Wed Apr 16 23:38:40 2014 +0200 Tests: Make sure include directories 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 0000000..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 0000000..10f3293 --- /dev/null +++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake new file mode 100644 index 0000000..d6f08bd --- /dev/null +++ b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake @@ -0,0 +1,9 @@ + +add_library(testTarget empty.cpp) +target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir") + +install(TARGETS testTarget EXPORT testTargets + DESTINATION lib +) + +install(EXPORT testTargets DESTINATION lib/cmake) diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake index 434beb9..c5b29d0 100644 --- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake +++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake @@ -13,6 +13,9 @@ run_cmake(install_config) run_cmake(incomplete-genex) run_cmake(export-NOWARN) +set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix") +run_cmake(DirInInstallPrefix) + configure_file( "${RunCMake_SOURCE_DIR}/CMakeLists.txt" "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt" ----------------------------------------------------------------------- Summary of changes: Source/cmExportFileGenerator.cxx | 5 ++++- .../BinInInstallPrefix-CMP0052-WARN-stderr.txt | 5 +++++ .../DirInInstallPrefix-result.txt} | 0 .../DirInInstallPrefix-stderr.txt} | 0 .../{InstallPrefixInInterface.cmake => DirInInstallPrefix.cmake} | 6 ++---- Tests/RunCMake/include_directories/RunCMakeTest.cmake | 3 +++ .../SrcInInstallPrefix-CMP0052-WARN-stderr.txt | 5 +++++ 7 files changed, 19 insertions(+), 5 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