FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix header installation for shared build

Browse Source
This commit is contained in:
James Turner
2011-11-30 09:45:32 +00:00
parent 42b7c48671
commit fee652d54a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeModules/SimGearComponent.cmake
+2 -1
View File
@@ -17,8 +17,9 @@ macro(simgear_component_common name includePath sourcesList sources headers)
add_library(${libName} STATIC ${sources} ${headers}) add_library(${libName} STATIC ${sources} ${headers})
install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX}) install (TARGETS ${libName} ARCHIVE DESTINATION lib${LIB_SUFFIX})
install (FILES ${headers} DESTINATION include/simgear/${includePath})
endif() endif()
install (FILES ${headers} DESTINATION include/simgear/${includePath})
endmacro() endmacro()
function(simgear_component name includePath sources headers) function(simgear_component name includePath sources headers)
simgear/CMakeLists.txt
+2 -3
View File
@@ -51,12 +51,11 @@ if(SIMGEAR_SHARED)
# set_property(TARGET SimGearCore PROPERTY FRAMEWORK 1) # set_property(TARGET SimGearCore PROPERTY FRAMEWORK 1)
# message(STATUS "public header: ${publicHeaders}") # 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) set_property(TARGET SimGearCore PROPERTY LINKER_LANGUAGE CXX)
target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY}) target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY})
install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX} install(TARGETS SimGearCore LIBRARY DESTINATION lib${LIB_SUFFIX})
PUBLIC_HEADER DESTINATION include/simgear)
if(NOT SIMGEAR_HEADLESS) if(NOT SIMGEAR_HEADLESS)
if(LIBSVN_FOUND) if(LIBSVN_FOUND)