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 1b73e5cafe67d30830bd0f4e5da9a3aa60596a65 (commit) via 0df250edf368f1e1f2cfd835048a3fc56c29ef60 (commit) via a4d23e47aad911617426c9e575a3b4b77df67bbc (commit) from 3167c36e576b4c9cb8011b6e862278575ea2f8ba (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=1b73e5cafe67d30830bd0f4e5da9a3aa60596a65 commit 1b73e5cafe67d30830bd0f4e5da9a3aa60596a65 Merge: 3167c36 0df250e Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 25 15:10:07 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Mar 25 15:10:07 2013 -0400 Merge topic 'error-on-exported-missing-include-dir' into next 0df250e Add tests for new messages. a4d23e4 Add tests for new messages. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0df250edf368f1e1f2cfd835048a3fc56c29ef60 commit 0df250edf368f1e1f2cfd835048a3fc56c29ef60 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 25 20:08:18 2013 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Mar 25 20:09:01 2013 +0100 Add tests for new messages. diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 2efeab0..b4fdcd5 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2830,7 +2830,7 @@ static void processIncludeDirectories(cmTarget *tgt, { cmOStringStream e; e << "Imported target \"" << (*it)->TargetName << "\" includes " - "non-existent path \"" << *li << "\" in its " + "non-existent path\n \"" << *li << "\"\nin its " "INTERFACE_INCLUDE_DIRECTORIES. Possible reasons include:\n" "* The path was deleted, renamed, or moved to another " "location.\n" diff --git a/Tests/RunCMake/include_directories/ImportedTarget-result.txt b/Tests/RunCMake/include_directories/ImportedTarget-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/include_directories/ImportedTarget-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include_directories/ImportedTarget-stderr.txt b/Tests/RunCMake/include_directories/ImportedTarget-stderr.txt new file mode 100644 index 0000000..da26052 --- /dev/null +++ b/Tests/RunCMake/include_directories/ImportedTarget-stderr.txt @@ -0,0 +1,13 @@ +CMake Error in CMakeLists.txt: + Imported target "imported" includes non-existent path + + "/does/not/exist" + + in its INTERFACE_INCLUDE_DIRECTORIES. Possible reasons include: + + \* The path was deleted, renamed, or moved to another location. + + \* An install or uninstall procedure did not complete successfully. + + \* The installation package was faulty and references files it does not + provide. diff --git a/Tests/RunCMake/include_directories/ImportedTarget.cmake b/Tests/RunCMake/include_directories/ImportedTarget.cmake new file mode 100644 index 0000000..e1a20b1 --- /dev/null +++ b/Tests/RunCMake/include_directories/ImportedTarget.cmake @@ -0,0 +1,9 @@ + +project(ImportedTarget) + +add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp") + +add_library(imported UNKNOWN IMPORTED) +set_property(TARGET imported PROPERTY INTERFACE_INCLUDE_DIRECTORIES "/does/not/exist") + +target_link_libraries(testTarget imported) diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake index bd299fc..1caae5c 100644 --- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake +++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake @@ -6,3 +6,4 @@ run_cmake(TID-bad-target) run_cmake(SourceDirectoryInInterface) run_cmake(BinaryDirectoryInInterface) run_cmake(RelativePathInInterface) +run_cmake(ImportedTarget) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4d23e47aad911617426c9e575a3b4b77df67bbc commit a4d23e47aad911617426c9e575a3b4b77df67bbc Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 25 20:07:53 2013 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Mar 25 20:08:48 2013 +0100 Add tests for new messages. diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index b0a0dbf..24940aa 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -203,8 +203,8 @@ static bool checkInterfaceDirs(const std::string &prepro, { cmOStringStream e; e << "Target \"" << target->GetName() << "\" " - "INTERFACE_INCLUDE_DIRECTORIES property contains relative path \"" - << *li << "\"."; + "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n" + " \"" << *li << "\""; target->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str().c_str()); return false; @@ -217,8 +217,8 @@ static bool checkInterfaceDirs(const std::string &prepro, { cmOStringStream e; e << "Target \"" << target->GetName() << "\" " - "INTERFACE_INCLUDE_DIRECTORIES property contains path \"" - << *li << "\" which is prefixed in the build directory."; + "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n" + " \"" << *li << "\"\nwhich is prefixed in the build directory."; target->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str().c_str()); return false; @@ -229,8 +229,8 @@ static bool checkInterfaceDirs(const std::string &prepro, { cmOStringStream e; e << "Target \"" << target->GetName() << "\" " - "INTERFACE_INCLUDE_DIRECTORIES property contains path \"" - << *li << "\" which is prefixed in the source directory."; + "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n" + " \"" << *li << "\"\nwhich is prefixed in the source directory."; target->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str().c_str()); return false; diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt new file mode 100644 index 0000000..0d4379e --- /dev/null +++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*RunCMake/include_directories/BinaryDirectoryInInterface-build/foo" + + which is prefixed in the build directory. diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake new file mode 100644 index 0000000..8754540 --- /dev/null +++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake @@ -0,0 +1,11 @@ + +project(BinaryDirectoryInInterface) + +add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp") +target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo") + +install(TARGETS testTarget EXPORT testTargets + DESTINATION lib +) + +install(EXPORT testTargets DESTINATION lib/cmake) diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt new file mode 100644 index 0000000..f6cdb53 --- /dev/null +++ b/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt @@ -0,0 +1,5 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains + relative path: + + "foo" diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface.cmake b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake new file mode 100644 index 0000000..f2ce54a --- /dev/null +++ b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake @@ -0,0 +1,11 @@ + +project(RelativePathInInterface) + +add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp") +set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo") + +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 ddf268c..bd299fc 100644 --- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake +++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake @@ -3,3 +3,6 @@ include(RunCMake) run_cmake(NotFoundContent) run_cmake(DebugIncludes) run_cmake(TID-bad-target) +run_cmake(SourceDirectoryInInterface) +run_cmake(BinaryDirectoryInInterface) +run_cmake(RelativePathInInterface) diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt new file mode 100644 index 0000000..9346b99 --- /dev/null +++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*RunCMake/include_directories/foo" + + which is prefixed in the source directory. diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake new file mode 100644 index 0000000..c9a9c45 --- /dev/null +++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake @@ -0,0 +1,11 @@ + +project(SourceDirectoryInInterface) + +add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp") +target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo") + +install(TARGETS testTarget EXPORT testTargets + DESTINATION lib +) + +install(EXPORT testTargets DESTINATION lib/cmake) diff --git a/Tests/RunCMake/include_directories/empty.cpp b/Tests/RunCMake/include_directories/empty.cpp new file mode 100644 index 0000000..e69de29 ----------------------------------------------------------------------- Summary of changes: Source/cmExportFileGenerator.cxx | 12 ++++++------ Source/cmTarget.cxx | 2 +- .../BinaryDirectoryInInterface-result.txt} | 0 .../BinaryDirectoryInInterface-stderr.txt | 6 ++++++ .../BinaryDirectoryInInterface.cmake | 11 +++++++++++ .../ImportedTarget-result.txt} | 0 .../include_directories/ImportedTarget-stderr.txt | 13 +++++++++++++ .../include_directories/ImportedTarget.cmake | 9 +++++++++ .../RelativePathInInterface-result.txt} | 0 .../RelativePathInInterface-stderr.txt | 5 +++++ .../RelativePathInInterface.cmake | 11 +++++++++++ .../include_directories/RunCMakeTest.cmake | 4 ++++ .../SourceDirectoryInInterface-result.txt} | 0 .../SourceDirectoryInInterface-stderr.txt | 6 ++++++ .../SourceDirectoryInInterface.cmake | 11 +++++++++++ .../{CMP0004 => include_directories}/empty.cpp | 0 16 files changed, 83 insertions(+), 7 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/BinaryDirectoryInInterface-result.txt} (100%) create mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt create mode 100644 Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/ImportedTarget-result.txt} (100%) create mode 100644 Tests/RunCMake/include_directories/ImportedTarget-stderr.txt create mode 100644 Tests/RunCMake/include_directories/ImportedTarget.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/RelativePathInInterface-result.txt} (100%) create mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt create mode 100644 Tests/RunCMake/include_directories/RelativePathInInterface.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/SourceDirectoryInInterface-result.txt} (100%) create mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt create mode 100644 Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake copy Tests/RunCMake/{CMP0004 => include_directories}/empty.cpp (100%) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits