From: Jean-Philippe Bruyère Date: Tue, 4 Jan 2022 08:58:46 +0000 (+0100) Subject: cleanup cmake X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=eacf8c433edb8b024c4edaa2564ba7dcaadf51a1;p=jp%2Fvkhelpers.git cleanup cmake --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ff00e1..f719f11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,39 +59,28 @@ ENDIF() CONFIGURE_FILE(vkh.pc.in vkh.pc @ONLY) INSTALL(FILES ${CMAKE_CURRENT_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 - C_STANDARD 11 - C_EXTENSIONS OFF - PUBLIC_HEADER include/vkh.h - ) - TARGET_INCLUDE_DIRECTORIES(${LibName} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src - ${Vulkan_INCLUDE_DIRS} - ) - TARGET_LINK_LIBRARIES(${LibName} +ADD_LIBRARY("${PROJECT_NAME}" ${sources}) + +SET_TARGET_PROPERTIES("${PROJECT_NAME}" PROPERTIES + OUTPUT_NAME ${PROJECT_NAME} + VERSION ${PROJECT_VERSION} + SOVERSION 1 + C_STANDARD 11 + C_EXTENSIONS OFF + PUBLIC_HEADER include/vkh.h +) +TARGET_INCLUDE_DIRECTORIES("${PROJECT_NAME}" + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${Vulkan_INCLUDE_DIRS} +) +TARGET_LINK_LIBRARIES("${PROJECT_NAME}" + PUBLIC ${Vulkan_LIBRARIES} - ) - INSTALL(TARGETS ${LibName} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -ENDFUNCTION () - -ADD_LIBRARY("${PROJECT_NAME}_static" STATIC ${sources}) -SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE OFF) -setup_lib ("${PROJECT_NAME}_static") - -ADD_LIBRARY("${PROJECT_NAME}_shared" SHARED ${sources}) -SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE ON) -setup_lib ("${PROJECT_NAME}_shared") - - -#get_cmake_property(_variableNames VARIABLES) -#foreach (_variableName ${_variableNames}) -#message(STATUS "${_variableName}=${${_variableName}}") -#endforeach() +) +INSTALL(TARGETS "${PROJECT_NAME}" + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})