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

[CMake] Fixed mac dylib packaging.

RPATH is now executable_path/../lib only.
parent 83eee338
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,7 @@ endforeach() ...@@ -87,7 +87,7 @@ endforeach()
set(CONAN_IMPORTS "") set(CONAN_IMPORTS "")
if(APPLE) if(APPLE)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.dylib* -> ./bin") set(CONAN_IMPORTS ${CONAN_IMPORTS} "lib, *.dylib* -> ./lib")
endif() endif()
if(MSVC) if(MSVC)
set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin") set(CONAN_IMPORTS ${CONAN_IMPORTS} "bin, *.dll* -> ./bin")
......
...@@ -106,21 +106,6 @@ cpack_add_component(ogs_docs ...@@ -106,21 +106,6 @@ cpack_add_component(ogs_docs
) )
if(OGS_USE_CONAN) 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 Qt platform shared libraries
install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/platforms DESTINATION bin OPTIONAL) install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/platforms DESTINATION bin OPTIONAL)
endif() endif()
......
set(CPACK_GENERATOR TGZ) set(CPACK_GENERATOR TGZ)
# Adds the binaries location to the LD_LIBRARY_PATH # 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) if(MODULE_CMD)
message(STATUS "Found module cmd -> writing module file.") message(STATUS "Found module cmd -> writing module file.")
...@@ -28,3 +28,8 @@ set(README_PLATFORM_INSTRUCTIONS ...@@ -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" "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 "" CACHE INTERNAL ""
) )
if(OGS_USE_CONAN)
file(GLOB MATCHED_FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.so*")
install(FILES ${MATCHED_FILES} DESTINATION lib)
endif()
...@@ -13,7 +13,17 @@ set(CPACK_DMG_FORMAT "UDBZ") ...@@ -13,7 +13,17 @@ set(CPACK_DMG_FORMAT "UDBZ")
set(CPACK_DMG_BACKGROUND_IMAGE ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.png) 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(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) if(OGS_BUILD_GUI)
install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS) install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
......
...@@ -22,6 +22,11 @@ if(OGS_DOWNLOAD_ADDITIONAL_CONTENT) ...@@ -22,6 +22,11 @@ if(OGS_DOWNLOAD_ADDITIONAL_CONTENT)
set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "docs" "Documentation folder") set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "docs" "Documentation folder")
endif() 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) if(OGS_BUILD_GUI)
install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS) install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
......
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