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

Merge topic 'fix-export-includes-crash'

Browse Source 
f868e47 Fix crash on export of target with empty INTERFACE_INCLUDE_DIRECTORIES.
This commit is contained in:
Brad King 2013-07-29 09:59:29 -04:00 committed by CMake Topic Stage
commit c18117a129
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmExportFileGenerator.cxx
View File

@ -291,7 +291,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
{ {
return; return;
} }
if (!*input && tei->InterfaceIncludeDirectories.empty()) if ((input && !*input) && tei->InterfaceIncludeDirectories.empty())
{ {
// Set to empty // Set to empty
properties[propName] = ""; properties[propName] = "";

3
Tests/ExportImport/Export/CMakeLists.txt
View File

@ -270,6 +270,8 @@ set_property(TARGET cmp0022NEW APPEND PROPERTY INTERFACE_LINK_LIBRARIES testLib2
set_property(TARGET cmp0022OLD APPEND PROPERTY INTERFACE_LINK_LIBRARIES testLib2) set_property(TARGET cmp0022OLD APPEND PROPERTY INTERFACE_LINK_LIBRARIES testLib2)
set_property(TARGET cmp0022OLD APPEND PROPERTY LINK_INTERFACE_LIBRARIES testLib3) set_property(TARGET cmp0022OLD APPEND PROPERTY LINK_INTERFACE_LIBRARIES testLib3)
add_library(noIncludesInterface empty.cpp)
install(TARGETS testLibRequired install(TARGETS testLibRequired
testLibIncludeRequired1 testLibIncludeRequired1
testLibIncludeRequired2 testLibIncludeRequired2
@ -278,6 +280,7 @@ install(TARGETS testLibRequired
testLibIncludeRequired5 testLibIncludeRequired5
testLibIncludeRequired6 testLibIncludeRequired6
testSharedLibRequired testSharedLibRequired
noIncludesInterface
EXPORT RequiredExp DESTINATION lib EXPORT RequiredExp DESTINATION lib
INCLUDES DESTINATION INCLUDES DESTINATION
installIncludesTest installIncludesTest

4
Tests/ExportImport/Export/empty.cpp Normal file
View File

@ -0,0 +1,4 @@
#ifdef _WIN32
__declspec(dllexport)
#endif
int empty() { return 0; }