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

Merge topic 'error-on-exported-missing-include-dir'

Browse Source 
634bb33 Error if linked target has relative paths in INTERFACE_INCLUDE_DIRECTORIES
This commit is contained in:
Brad King 2013-03-28 10:42:42 -04:00 committed by CMake Topic Stage
commit 2afcbe3090
5 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmTarget.cxx
View File

@ -2842,6 +2842,20 @@ static void processIncludeDirectories(cmTarget *tgt,
return; return;
} }
if (!cmSystemTools::FileIsFullPath(li->c_str()))
{
if (!(*it)->TargetName.empty())
{
cmOStringStream e;
e << "Target \"" << (*it)->TargetName << "\" contains relative "
"path in its INTERFACE_INCLUDE_DIRECTORIES:\n"
" \"" << *li << "\" ";
tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR,
e.str().c_str());
return;
}
}
if (testIsOff && !cmSystemTools::IsOff(li->c_str())) if (testIsOff && !cmSystemTools::IsOff(li->c_str()))
{ {
cmSystemTools::ConvertToUnixSlashes(*li); cmSystemTools::ConvertToUnixSlashes(*li);

1
Tests/RunCMake/include_directories/RelativePathInGenex-result.txt Normal file
View File

@ -0,0 +1 @@
1

5
Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt Normal file
View File

@ -0,0 +1,5 @@
CMake Error in CMakeLists.txt:
Target "testTarget" contains relative path in its
INTERFACE_INCLUDE_DIRECTORIES:
"foo"

8
Tests/RunCMake/include_directories/RelativePathInGenex.cmake Normal file
View File

@ -0,0 +1,8 @@
project(RelativePathInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
target_link_libraries(userTarget testTarget)

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

@ -7,3 +7,4 @@ run_cmake(SourceDirectoryInInterface)
run_cmake(BinaryDirectoryInInterface) run_cmake(BinaryDirectoryInInterface)
run_cmake(RelativePathInInterface) run_cmake(RelativePathInInterface)
run_cmake(ImportedTarget) run_cmake(ImportedTarget)
run_cmake(RelativePathInGenex)