diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 94f2ca209c48f84f201889ce93042dcde28b4f28..72135a8d25abeeda4ebf976de3355c2850c1e6cf 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -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") diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake index 0742db29b613fa548e04634ac30f9e8ee9013af4..3ef648bf2d41e0433cb2ce141fef26f944b95977 100644 --- a/scripts/cmake/packaging/Pack.cmake +++ b/scripts/cmake/packaging/Pack.cmake @@ -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 diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake index c35013f60f599c81e744b87ff0c9ddb1fae2a6c5..44c11444832ab1cc46830e9938b33d94a3c209a0 100644 --- a/scripts/cmake/packaging/PackagingLinux.cmake +++ b/scripts/cmake/packaging/PackagingLinux.cmake @@ -1,6 +1,9 @@ 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.")