Fix install when using a config + debug configuration

This commit is contained in:
Olivier Goffart 2020-10-08 10:32:54 +02:00
parent 2837bf3a5f
commit 11d367467a
2 changed files with 17 additions and 15 deletions

View file

@ -77,16 +77,24 @@ install(TARGETS SixtyFPS sixtyfps-rendering-backend-default
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
include(GNUInstallDirs) include(GNUInstallDirs)
get_target_property(SIXTYFPS_SHARED_LIB sixtyfps-rendering-backend-default-shared IMPORTED_LOCATION) install(FILES $<TARGET_FILE:sixtyfps-rendering-backend-default-shared> TYPE LIB)
install(FILES ${SIXTYFPS_SHARED_LIB} TYPE LIB) if(WIN32)
if (WIN32) install(FILES $<TARGET_LINKER_FILE:sixtyfps-rendering-backend-default-shared> TYPE LIB)
get_filename_component(SIXTYFPS_SHARED_LIB_DIR ${SIXTYFPS_SHARED_LIB} DIRECTORY)
get_filename_component(SIXTYFPS_SHARED_LIB_WE ${SIXTYFPS_SHARED_LIB} NAME_WLE)
install(FILES "${SIXTYFPS_SHARED_LIB_DIR}/${SIXTYFPS_SHARED_LIB_WE}.lib" TYPE LIB)
endif() endif()
get_target_property(SIXTYFPS_COMPILER_PATH sixtyfps_compiler IMPORTED_LOCATION) install(PROGRAMS $<TARGET_FILE:sixtyfps_compiler> TYPE BIN)
install(PROGRAMS ${SIXTYFPS_COMPILER_PATH} TYPE BIN)
set(SIXTYFPS_LIB_PROPERTIES "")
foreach(prop
IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE
IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE)
get_target_property(value sixtyfps-rendering-backend-default-shared ${prop})
if(value)
get_filename_component(value ${value} NAME)
list(APPEND SIXTYFPS_LIB_PROPERTIES ${prop} "\${_IMPORT_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${value}")
endif()
endforeach()
configure_package_config_file("cmake/SixtyFPSConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SixtyFPS/SixtyFPSConfig.cmake" INSTALL_DESTINATION lib/cmake/SixtyFPS) configure_package_config_file("cmake/SixtyFPSConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/SixtyFPS/SixtyFPSConfig.cmake" INSTALL_DESTINATION lib/cmake/SixtyFPS)

View file

@ -18,13 +18,7 @@ if(_IMPORT_PREFIX STREQUAL "/")
endif() endif()
add_library(sixtyfps-rendering-backend-default-shared SHARED IMPORTED) add_library(sixtyfps-rendering-backend-default-shared SHARED IMPORTED)
get_filename_component(SIXTYFPS_SHARED_LIB @SIXTYFPS_SHARED_LIB@ NAME_WLE) set_target_properties(sixtyfps-rendering-backend-default-shared PROPERTIES @SIXTYFPS_LIB_PROPERTIES@)
set_property(TARGET sixtyfps-rendering-backend-default-shared PROPERTY IMPORTED_LOCATION
"${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/${SIXTYFPS_SHARED_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}")
if (WIN32)
set_property(TARGET ${internal_lib} PROPERTY IMPORTED_IMPLIB
"${_IMPORT_PREFIX}/@CMAKE_INSTALL_LIBDIR@/${SIXTYFPS_SHARED_LIB}.lib")
endif()
add_executable(SixtyFPS::sixtyfps_compiler IMPORTED GLOBAL) add_executable(SixtyFPS::sixtyfps_compiler IMPORTED GLOBAL)
set_target_properties(SixtyFPS::sixtyfps_compiler PROPERTIES IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_BINDIR@/sixtyfps_compiler${CMAKE_EXECUTABLE_SUFFIX}") set_target_properties(SixtyFPS::sixtyfps_compiler PROPERTIES IMPORTED_LOCATION "${_IMPORT_PREFIX}/@CMAKE_INSTALL_BINDIR@/sixtyfps_compiler${CMAKE_EXECUTABLE_SUFFIX}")