]> O.S.I.I.S - jp/vkhelpers.git/commitdiff
dont use same obj for shared and static (for runtime perfs), set same output name...
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 2 Apr 2018 19:22:05 +0000 (21:22 +0200)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 2 Apr 2018 19:22:05 +0000 (21:22 +0200)
CMakeLists.txt

index a23b25e4d5905ae4f620ae7fe7d9ba1da4f7b04e..a7a5b37347588ce47c93c0ad652e7f7587360f8e 100644 (file)
@@ -22,25 +22,23 @@ INCLUDE(GNUInstallDirs)
 
 FILE(GLOB sources src/*.c)
 
-ADD_LIBRARY(objlib OBJECT ${sources})
-TARGET_INCLUDE_DIRECTORIES(objlib PRIVATE
-               ${CMAKE_CURRENT_SOURCE_DIR}/include
-               ${CMAKE_CURRENT_SOURCE_DIR}/src
-)
-SET_PROPERTY(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1) #PIC option for shared lib
-
-ADD_LIBRARY("${PROJECT_NAME}_shared" SHARED $<TARGET_OBJECTS:objlib>)
-ADD_LIBRARY("${PROJECT_NAME}_static" STATIC $<TARGET_OBJECTS:objlib>)
+ADD_LIBRARY("${PROJECT_NAME}_shared" SHARED ${sources})
+ADD_LIBRARY("${PROJECT_NAME}_static" STATIC ${sources})
 
 CONFIGURE_FILE(vkh.pc.in vkh.pc @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/vkh.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
 
 FUNCTION (setup_lib LibName)
        SET_TARGET_PROPERTIES(${LibName} PROPERTIES
+                       OUTPUT_NAME ${PROJECT_NAME}
                        VERSION ${PROJECT_VERSION}
                        SOVERSION 1
                        PUBLIC_HEADER include/vkh.h
        )
+       TARGET_INCLUDE_DIRECTORIES(${LibName} PRIVATE
+                       ${CMAKE_CURRENT_SOURCE_DIR}/include
+                       ${CMAKE_CURRENT_SOURCE_DIR}/src
+       )
        TARGET_LINK_LIBRARIES(${LibName}
                ${Vulkan_LIBRARY}
                ${GLFW3_LIBRARY}