]> git.mxchange.org Git - simgear.git/commitdiff
Fix header installation for shared build
authorJames Turner <zakalawe@mac.com>
Wed, 30 Nov 2011 09:45:32 +0000 (09:45 +0000)
committerJames Turner <zakalawe@mac.com>
Wed, 30 Nov 2011 09:45:32 +0000 (09:45 +0000)
CMakeModules/SimGearComponent.cmake
simgear/CMakeLists.txt

index 5628e5a183711201b9f63f8dd83b09cafdd45501..dd7e3309b5fc49c1c2420de2d72456463abbbe96 100644 (file)
@@ -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)
index f85ccc3f18908e23d9c176f675e5f340bedc2548..57f013267f7667d9e59724ff6200c3b9c223b199 100644 (file)
@@ -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)