From fee652d54abd8e30ffbd0d1d4e8c77257fd76575 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 30 Nov 2011 09:45:32 +0000 Subject: [PATCH] Fix header installation for shared build --- CMakeModules/SimGearComponent.cmake | 3 ++- simgear/CMakeLists.txt | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/SimGearComponent.cmake b/CMakeModules/SimGearComponent.cmake index 5628e5a1..dd7e3309 100644 --- a/CMakeModules/SimGearComponent.cmake +++ b/CMakeModules/SimGearComponent.cmake @@ -17,8 +17,9 @@ macro(simgear_component_common name includePath sourcesList sources headers) add_library(${libName} STATIC ${sources} ${headers}) install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX}) - install (FILES ${headers} DESTINATION include/simgear/${includePath}) endif() + + install (FILES ${headers} DESTINATION include/simgear/${includePath}) endmacro() function(simgear_component name includePath sources headers) diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt index f85ccc3f..57f01326 100644 --- a/simgear/CMakeLists.txt +++ b/simgear/CMakeLists.txt @@ -51,12 +51,11 @@ if(SIMGEAR_SHARED) # set_property(TARGET SimGearCore PROPERTY FRAMEWORK 1) # message(STATUS "public header: ${publicHeaders}") - set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}") + # set_property(TARGET SimGearCore PROPERTY PUBLIC_HEADER "${publicHeaders}") set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX) target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY}) - install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX} - PUBLIC_HEADER DESTINATION include/simgear) + install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX}) if(NOT SIMGEAR_HEADLESS) if(LIBSVN_FOUND)