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

Merge topic 'install-interface-includes' 

72d13ff install: Remove error condition using INCLUDES DESTINATION without EXPORT.
This commit is contained in:
Brad King 2013-07-31 08:48:36 -04:00 committed by CMake Topic Stage
parent cdfeda60f6 72d13ff482
commit b728ec3c31
5 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmInstallCommand.cxx
View File

@ -295,13 +295,6 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
return false; return false;
} }
if(!includesArgs.GetIncludeDirs().empty() && exports.GetString().empty())
{
this->SetError("TARGETS given INCLUDES DESTINATION, but EXPORT set "
"not specified.");
return false;
}
// Enforce argument rules too complex to specify for the // Enforce argument rules too complex to specify for the
// general-purpose parser. // general-purpose parser.
if(archiveArgs.GetNamelinkOnly() || if(archiveArgs.GetNamelinkOnly() ||

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

@ -9,4 +9,3 @@ run_cmake(RelativePathInInterface)
run_cmake(ImportedTarget) run_cmake(ImportedTarget)
run_cmake(RelativePathInGenex) run_cmake(RelativePathInGenex)
run_cmake(CMP0021) run_cmake(CMP0021)
run_cmake(TargetInterfaceIncludes)

1
Tests/RunCMake/include_directories/TargetInterfaceIncludes-result.txt
View File

@ -1 +0,0 @@
1

4
Tests/RunCMake/include_directories/TargetInterfaceIncludes-stderr.txt
View File

@ -1,4 +0,0 @@
CMake Error at TargetInterfaceIncludes.cmake:3 \(install\):
install TARGETS given INCLUDES DESTINATION, but EXPORT set not specified.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

4
Tests/RunCMake/include_directories/TargetInterfaceIncludes.cmake
View File

@ -1,4 +0,0 @@
add_library(empty empty.cpp)
install(TARGETS empty DESTINATION lib INCLUDES DESTINATION include)
# install(EXPORT )