Skip to content
Snippets Groups Projects
Commit 0fa6b9f6 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Installation of .so files into install-dir/lib when using Conan.

RPath is adapted too.
parent c4233e38
No related branches found
No related tags found
No related merge requests found
......@@ -77,6 +77,9 @@ if(MSVC)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin")
set(CONAN_IMPORTS ${CONAN_IMPORTS} "plugins/platforms, *.dll* -> ./bin/platforms")
endif()
if(UNIX AND NOT APPLE)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.so* -> ./lib")
endif()
file(TIMESTAMP ${PROJECT_BINARY_DIR}/conan_install_timestamp.txt file_timestamp "%Y.%m.%d")
string(TIMESTAMP timestamp "%Y.%m.%d")
......
......@@ -104,11 +104,17 @@ cpack_add_component(ogs_docs
if(OGS_USE_CONAN)
# Install shared libraries, copied to bin-dir
foreach(PATTERN "*.dll" "*.dylib")
foreach(PATTERN "*.dll" "*.dylib*")
file(GLOB MATCHED_FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PATTERN})
install(FILES ${MATCHED_FILES} DESTINATION bin)
endforeach()
# Install shared libraries, copied to lib-dir
foreach(PATTERN "*.so*")
file(GLOB MATCHED_FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PATTERN})
install(FILES ${MATCHED_FILES} DESTINATION lib)
endforeach()
# macOS frameworks are directories, exclude header files
file(GLOB MATCHED_DIRECTORIES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.framework")
install(DIRECTORY ${MATCHED_DIRECTORIES} DESTINATION bin
......
set(CPACK_GENERATOR TGZ)
# Adds the binaries location to the LD_LIBRARY_PATH
set(CMAKE_INSTALL_RPATH \$ORIGIN/)
if(OGS_USE_CONAN)
SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
endif()
if(MODULE_CMD)
message(STATUS "Found module cmd -> writing module file.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment