summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-07 12:54:37 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-07-07 12:54:37 (GMT)
commitf1626aa1013d0101333f05840263676cb0a7b9cd (patch)
tree5c4f2a2d6c1273ead1114cba4aaf65934ba0c635 /Modules
parentc9feebb9e88532680c0cbd6066f9ffaf45f747b1 (diff)
parent5ca1d3d59c9a0c7df7db335fe225896480e4873f (diff)
downloadCMake-f1626aa1013d0101333f05840263676cb0a7b9cd.zip
CMake-f1626aa1013d0101333f05840263676cb0a7b9cd.tar.gz
CMake-f1626aa1013d0101333f05840263676cb0a7b9cd.tar.bz2
Merge topic 'dev/export-from-obj-libs'
5ca1d3d5 GenerateExportHeader: support exporting from OBJECT libraries
Diffstat (limited to 'Modules')
-rw-r--r--Modules/GenerateExportHeader.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 66d300a..f00b577 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -363,6 +363,7 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
if(NOT ${type} STREQUAL "STATIC_LIBRARY"
AND NOT ${type} STREQUAL "SHARED_LIBRARY"
+ AND NOT ${type} STREQUAL "OBJECT_LIBRARY"
AND NOT ${type} STREQUAL "MODULE_LIBRARY")
message(WARNING "This macro can only be used with libraries")
return()