From 364cd4e9f3acaf5e97ae8eb0c01099cf7bc6980e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 12 Feb 2018 14:55:48 +0100
Subject: [PATCH] [CMake] Fixed macOS packaging.
Install required Conan libs into package.
Fixed Conan CMake variable typo.
---
Applications/CLI/CMakeLists.txt | 5 ---
Applications/DataExplorer/DataExplorer.cmake | 4 --
CMakeLists.txt | 1 -
scripts/cmake/Find.cmake | 3 --
scripts/cmake/ProjectSetup.cmake | 2 +-
.../cmake/packaging/InstallDependencies.cmake | 45 -------------------
scripts/cmake/packaging/Pack.cmake | 2 +-
7 files changed, 2 insertions(+), 60 deletions(-)
delete mode 100644 scripts/cmake/packaging/InstallDependencies.cmake
diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index e049b6591a6..97cbdd8f4e8 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -34,8 +34,3 @@ cpack_add_component(ogs_cli
DESCRIPTION "The command line interface for OpenGeoSys."
GROUP Applications
)
-
-if(NOT APPLE AND OGS_PACKAGE_DEPENDENCIES)
- include(packaging/InstallDependencies)
- InstallDependencies(ogs)
-endif()
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 261611523e3..7a77712399d 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -117,7 +117,3 @@ cpack_add_component(ogs_gui
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "DataExplorer" "OGS Data Explorer" PARENT_SCOPE)
set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/DataExplorer.exe" "Data Explorer" PARENT_SCOPE)
-if(NOT APPLE AND OGS_PACKAGE_DEPENDENCIES)
- include(packaging/InstallDependencies)
- InstallDependencies(DataExplorer)
-endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b2543286e4..64e2403c002 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,6 @@ option(OGS_SYNC_SUBMODULES "Sync git submodules on CMake run. Overwrites custom
# Packaging
option(OGS_DOWNLOAD_ADDITIONAL_CONTENT "Should additional content such as manuals be downloaded and packaged?" OFF)
-option(OGS_PACKAGE_DEPENDENCIES "Packages shared libraries when enabled." OFF)
include(scripts/cmake/packaging/Pack.cmake)
# Third-party libraries, names come from Conan package names
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 8eb71823513..681fa973161 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -109,9 +109,6 @@ find_package(Metis QUIET)
## Qt5 library ##
if(OGS_BUILD_GUI)
- if(USE_CONAN)
- set(Qt5_DIR ${CONAN_QT_ROOT}/lib/cmake/Qt5)
- endif()
find_package(Qt5 5.2 REQUIRED Gui Widgets Xml XmlPatterns)
cmake_policy(SET CMP0020 NEW)
set(CMAKE_AUTOMOC TRUE)
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index 116e900a7c7..730d1497bbe 100644
--- a/scripts/cmake/ProjectSetup.cmake
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -9,7 +9,7 @@ endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-if(USE_CONAN AND MSVC)
+if(OGS_USE_CONAN AND MSVC)
foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
diff --git a/scripts/cmake/packaging/InstallDependencies.cmake b/scripts/cmake/packaging/InstallDependencies.cmake
deleted file mode 100644
index 4824cd8dadc..00000000000
--- a/scripts/cmake/packaging/InstallDependencies.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-macro(InstallDependencies TARGET)
- set(EXCLUDE_SYSTEM 1)
- get_target_property(EXE_DIR ${TARGET} RUNTIME_OUTPUT_DIRECTORY)
- set(TARGET_EXE ${EXE_DIR}/${TARGET}${CMAKE_EXECUTABLE_SUFFIX})
-
- # Run CMake again after target was built to collect dependencies
- add_custom_command(TARGET ${TARGET} POST_BUILD
- COMMAND ${CMAKE_COMMAND} . -DPRE_INSTALL_RUN=ON
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-
- if(EXISTS ${TARGET_EXE})
- include(GetPrerequisites)
-
- set(dirs ${CONAN_BIN_DIRS})
- if(VTK_BUILD_SHARED_LIBS)
- list(APPEND dirs ${vtkIOXML_RUNTIME_LIBRARY_DIRS})
- endif()
- if(NOT WIN32)
- list(APPEND dirs "/usr/local/lib")
- endif()
-
- get_prerequisites(${TARGET_EXE} TARGET_DEPENDENCIES ${EXCLUDE_SYSTEM} 1 "" "${dirs}")
- if(PRE_INSTALL_RUN)
- message("-- Dependencies of target ${TARGET}:")
- endif()
- foreach(DEPENDENCY ${TARGET_DEPENDENCIES})
- if(NOT ${DEPENDENCY} MATCHES "@loader_path")
- gp_resolve_item("${TARGET_EXE}" "${DEPENDENCY}" "" "${dirs}" DEPENDENCY_PATH)
- get_filename_component(RESOLVED_DEPENDENCY_PATH "${DEPENDENCY_PATH}" REALPATH)
- string(TOLOWER ${DEPENDENCY} DEPENDENCY_LOWER)
- set(DEPENDENCY_PATHS ${DEPENDENCY_PATHS} ${RESOLVED_DEPENDENCY_PATH})
- if(PRE_INSTALL_RUN)
- message(" ${RESOLVED_DEPENDENCY_PATH}")
- endif()
- endif()
- endforeach()
- if(PRE_INSTALL_RUN)
- message("")
- endif()
- install(FILES ${DEPENDENCY_PATHS} DESTINATION bin)
- endif()
-
-endmacro()
-
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 271c89bc9ee..0742db29b61 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -102,7 +102,7 @@ cpack_add_component(ogs_docs
GROUP Utilities
)
-if(USE_CONAN)
+if(OGS_USE_CONAN)
# Install shared libraries, copied to bin-dir
foreach(PATTERN "*.dll" "*.dylib")
file(GLOB MATCHED_FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PATTERN})
--
GitLab