kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'object-library-missing-source' 

5a2fc3d Check for OBJECT_LIBRARY source files at start of generation
This commit is contained in:
Brad King 2013-11-02 10:54:15 -04:00 committed by CMake Topic Stage
parent 2043a86b6a 5a2fc3d696
commit 53ac9b8d86
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalGenerator.cxx
View File

@ -1242,6 +1242,7 @@ bool cmGlobalGenerator::CheckTargets()
target.GetType() == cmTarget::STATIC_LIBRARY || target.GetType() == cmTarget::STATIC_LIBRARY ||
target.GetType() == cmTarget::SHARED_LIBRARY || target.GetType() == cmTarget::SHARED_LIBRARY ||
target.GetType() == cmTarget::MODULE_LIBRARY || target.GetType() == cmTarget::MODULE_LIBRARY ||
target.GetType() == cmTarget::OBJECT_LIBRARY ||
target.GetType() == cmTarget::UTILITY) target.GetType() == cmTarget::UTILITY)
{ {
if(!target.FindSourceFiles()) if(!target.FindSourceFiles())

1
Tests/RunCMake/ObjectLibrary/MissingSource-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/ObjectLibrary/MissingSource-stderr.txt Normal file
View File

@ -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\)

1
Tests/RunCMake/ObjectLibrary/MissingSource.cmake Normal file
View File

@ -0,0 +1 @@
add_library(A OBJECT missing.c)

1
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
View File

@ -11,6 +11,7 @@ run_cmake(Install)
run_cmake(LinkObjLHS) run_cmake(LinkObjLHS)
run_cmake(LinkObjRHS1) run_cmake(LinkObjRHS1)
run_cmake(LinkObjRHS2) run_cmake(LinkObjRHS2)
run_cmake(MissingSource)
run_cmake(ObjWithObj) run_cmake(ObjWithObj)
run_cmake(PostBuild) run_cmake(PostBuild)
run_cmake(PreBuild) run_cmake(PreBuild)