From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 2 Apr 2018 19:22:05 +0000 (+0200)
Subject: dont use same obj for shared and static (for runtime perfs), set same output name... 
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=ad7cc04f519ead650e144512ac74445d25eedab7;p=jp%2Fvkhelpers.git

dont use same obj for shared and static (for runtime perfs), set same output name for both
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a23b25e..a7a5b37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}