diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 09cb006742fe197120fd6e16fc94c849ad8ab6e7..d3cd29dc5890ad1e27b75b4fe78de3bec1e2423b 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -87,7 +87,7 @@ endforeach() set(CONAN_IMPORTS "") if(APPLE) - set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.dylib* -> ./bin") + set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.dylib* -> ./lib") endif() if(MSVC) set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin") diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake index 98e162e7c965b5a9f22d114e9115953071a40c6e..d89b6473ba9df42444bd8292eac778dd47e062be 100644 --- a/scripts/cmake/packaging/Pack.cmake +++ b/scripts/cmake/packaging/Pack.cmake @@ -106,21 +106,6 @@ cpack_add_component(ogs_docs ) if(OGS_USE_CONAN) - # Install shared libraries, copied to bin-dir - file(GLOB MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dll") - install(FILES ${MATCHED_FILES} DESTINATION bin) - file(GLOB LIST_DIRECTORIES false MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dylib*") - install(FILES ${MATCHED_FILES} DESTINATION bin) - - # Install shared libraries, copied to lib-dir - file(GLOB MATCHED_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.so*") - install(FILES ${MATCHED_FILES} DESTINATION lib) - - # macOS frameworks are directories, exclude header files - file(GLOB MATCHED_DIRECTORIES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.framework") - install(DIRECTORY ${MATCHED_DIRECTORIES} DESTINATION bin - PATTERN "Headers" EXCLUDE) - # Install Qt platform shared libraries install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/platforms DESTINATION bin OPTIONAL) endif() diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake index 124610ce591d8cfee2d6d0130727e54ae7ed29d2..a1eb99ae6bd269a9a33272a0508b8e9e575aa9e5 100644 --- a/scripts/cmake/packaging/PackagingLinux.cmake +++ b/scripts/cmake/packaging/PackagingLinux.cmake @@ -1,6 +1,6 @@ set(CPACK_GENERATOR TGZ) # Adds the binaries location to the LD_LIBRARY_PATH -SET(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") if(MODULE_CMD) message(STATUS "Found module cmd -> writing module file.") @@ -28,3 +28,8 @@ set(README_PLATFORM_INSTRUCTIONS "When running the Data Explorer make sure to set the LD_LIBRARY_PATH path to the bin-folder. E.g.: LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ ./DataExplorer" CACHE INTERNAL "" ) + +if(OGS_USE_CONAN) + file(GLOB MATCHED_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.so*") + install(FILES ${MATCHED_FILES} DESTINATION lib) +endif() diff --git a/scripts/cmake/packaging/PackagingMac.cmake b/scripts/cmake/packaging/PackagingMac.cmake index ab79522ea06de0aab7e890db1fe907c6f972e0ee..8854394bedc47cd48749a4073dad2fa6f05856cd 100644 --- a/scripts/cmake/packaging/PackagingMac.cmake +++ b/scripts/cmake/packaging/PackagingMac.cmake @@ -13,7 +13,17 @@ set(CPACK_DMG_FORMAT "UDBZ") set(CPACK_DMG_BACKGROUND_IMAGE ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.png) set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/scripts/packaging/.DS_Store) -SET(CMAKE_INSTALL_RPATH "@executable_path;@executable_path/../${CMAKE_INSTALL_LIBDIR}") +SET(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") + +if(OGS_USE_CONAN) + file(GLOB MATCHED_FILES LIST_DIRECTORIES false "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib*") + install(FILES ${MATCHED_FILES} DESTINATION lib) + + # macOS frameworks are directories, exclude header files + file(GLOB MATCHED_DIRECTORIES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.framework") + install(DIRECTORY ${MATCHED_DIRECTORIES} DESTINATION bin + PATTERN "Headers" EXCLUDE) +endif() if(OGS_BUILD_GUI) install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS) diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake index 8f9db72c7d8866258ad6fc4b6d54642f850dc3a6..983881a9e2d893aaaef6ef2a5b51561d09b5eea3 100644 --- a/scripts/cmake/packaging/PackagingWin.cmake +++ b/scripts/cmake/packaging/PackagingWin.cmake @@ -22,6 +22,11 @@ if(OGS_DOWNLOAD_ADDITIONAL_CONTENT) set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "docs" "Documentation folder") endif() +if(OGS_USE_CONAN) + file(GLOB MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dll") + install(FILES ${MATCHED_FILES} DESTINATION bin) +endif() + if(OGS_BUILD_GUI) install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"