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 0ff6e579b977152c4a492135402c30fdc072f431 (commit) via 5a2fc3d69659717e530becddb3cbebb04583f4e9 (commit) from 635b94d0da0fe81c84e241eca9c845b02dea727a (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=0ff6e579b977152c4a492135402c30fdc072f431 commit 0ff6e579b977152c4a492135402c30fdc072f431 Merge: 635b94d 5a2fc3d Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Nov 1 14:50:01 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Nov 1 14:50:01 2013 -0400 Merge topic 'object-library-missing-source' into next 5a2fc3d Check for OBJECT_LIBRARY source files at start of generation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2fc3d69659717e530becddb3cbebb04583f4e9 commit 5a2fc3d69659717e530becddb3cbebb04583f4e9 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Nov 1 13:39:50 2013 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Nov 1 14:46:58 2013 -0400 Check for OBJECT_LIBRARY source files at start of generation Teach cmGlobalGenerator::CheckTargets to include OBJECT_LIBRARY targets in the check for source file existence. Extend the RunCMake.ObjectLibrary test to cover this case. diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 7f2b592..b12c691 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1088,6 +1088,7 @@ bool cmGlobalGenerator::CheckTargets() target.GetType() == cmTarget::STATIC_LIBRARY || target.GetType() == cmTarget::SHARED_LIBRARY || target.GetType() == cmTarget::MODULE_LIBRARY || + target.GetType() == cmTarget::OBJECT_LIBRARY || target.GetType() == cmTarget::UTILITY) { if(!target.FindSourceFiles()) diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt b/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/ObjectLibrary/MissingSource-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt b/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt new file mode 100644 index 0000000..411cd7c --- /dev/null +++ b/Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt @@ -0,0 +1,9 @@ +CMake Error at MissingSource.cmake:1 \(add_library\): + Cannot find source file: + + missing.c + + Tried extensions( \.[A-Za-z+]+| + )* +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/ObjectLibrary/MissingSource.cmake b/Tests/RunCMake/ObjectLibrary/MissingSource.cmake new file mode 100644 index 0000000..258eaed --- /dev/null +++ b/Tests/RunCMake/ObjectLibrary/MissingSource.cmake @@ -0,0 +1 @@ +add_library(A OBJECT missing.c) diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake index 55db14d..2dd8d38 100644 --- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake +++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake @@ -12,6 +12,7 @@ run_cmake(Install) run_cmake(LinkObjLHS) run_cmake(LinkObjRHS1) run_cmake(LinkObjRHS2) +run_cmake(MissingSource) run_cmake(ObjWithObj) run_cmake(PostBuild) run_cmake(PreBuild) ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalGenerator.cxx | 1 + .../MissingSource-result.txt} | 0 .../ObjectLibrary/MissingSource-stderr.txt | 9 +++++++++ Tests/RunCMake/ObjectLibrary/MissingSource.cmake | 1 + Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 1 + 5 files changed, 12 insertions(+), 0 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ObjectLibrary/MissingSource-result.txt} (100%) create mode 100644 Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt create mode 100644 Tests/RunCMake/ObjectLibrary/MissingSource.cmake hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits