Commit e1b851fd authored by Ghislain MARY's avatar Ghislain MARY

Install libraries at the right place + set correct install rpath.

parent 0dc492f1
...@@ -50,15 +50,15 @@ endmacro() ...@@ -50,15 +50,15 @@ endmacro()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if(NOT CPACK_GENERATOR AND NOT CMAKE_INSTALL_RPATH AND CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
endif()
include(GNUInstallDirs) include(GNUInstallDirs)
include(CheckSymbolExists) include(CheckSymbolExists)
include(CMakePushCheckState) include(CMakePushCheckState)
set(MSVC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/MSVC")
if(MSVC)
list(APPEND CMAKE_REQUIRED_INCLUDES "${MSVC_INCLUDE_DIR}")
endif()
# find_package should be invoked here to check for libraries - however do NOT # find_package should be invoked here to check for libraries - however do NOT
# call include_directories here (see below) # call include_directories here (see below)
......
...@@ -57,9 +57,9 @@ endif() ...@@ -57,9 +57,9 @@ endif()
target_link_libraries(belcard ${BELR_LIBRARIES} ${BCTOOLBOX_LIBRARIES}) target_link_libraries(belcard ${BELR_LIBRARIES} ${BCTOOLBOX_LIBRARIES})
install(TARGETS belcard EXPORT ${EXPORT_TARGETS_NAME}Targets install(TARGETS belcard EXPORT ${EXPORT_TARGETS_NAME}Targets
RUNTIME DESTINATION bin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment