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

[CMake] Added option OGS_PACKAGE_DEPENDENCIES.

Defaults to OFF. Packages shared libraries when enabled.
parent 904ae622
No related branches found
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@ cpack_add_component(ogs_cli
GROUP Applications
)
if(NOT APPLE)
if(NOT APPLE AND OGS_PACKAGE_DEPENDENCIES)
include(packaging/InstallDependencies)
InstallDependencies(ogs)
endif()
......@@ -117,7 +117,7 @@ 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)
if(NOT APPLE AND OGS_PACKAGE_DEPENDENCIES)
include(packaging/InstallDependencies)
InstallDependencies(DataExplorer)
endif()
......@@ -154,7 +154,8 @@ option(OGS_COVERAGE "Enables code coverage measurements with gcov/lcov." OFF)
option(OGS_SYNC_SUBMODULES "Sync git submodules on CMake run. Overwrites custom URLs!" ON)
# Packaging
option(OGS_DOWNLOAD_ADDITIONAL_CONTENT "Should addional content such as manuals be downloaded and packaged?" OFF)
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
......
......@@ -4,7 +4,8 @@ def defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache ' +
def defaultCMakeOptions =
'-DCMAKE_BUILD_TYPE=Release ' +
'-DOGS_USE_CONAN=ON ' +
'-DOGS_CPU_ARCHITECTURE=generic '
'-DOGS_CPU_ARCHITECTURE=generic ' +
'-DOGS_PACKAGE_DEPENDENCIES=ON '
def guiCMakeOptions =
'-DOGS_BUILD_CLI=OFF ' +
......
......@@ -2,7 +2,8 @@ def defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache'
def defaultCMakeOptions =
'-DCMAKE_BUILD_TYPE=Release ' +
'-DOGS_CPU_ARCHITECTURE=generic ' +
'-DDOCS_GENERATE_LOGFILE=ON '
'-DDOCS_GENERATE_LOGFILE=ON ' +
'-DOGS_PACKAGE_DEPENDENCIES=ON '
def guiCMakeOptions =
'-DOGS_BUILD_CLI=OFF ' +
......
def defaultCMakeOptions =
'-DOGS_USE_CONAN=ON ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON '
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
'-DOGS_PACKAGE_DEPENDENCIES=ON '
def guiCMakeOptions =
'-DOGS_BUILD_GUI=ON ' +
......
......@@ -3,6 +3,7 @@ def defaultCMakeOptions =
'-DOGS_USE_CONAN=ON ' +
'-DOGS_32_BIT=ON ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
'-DOGS_PACKAGE_DEPENDENCIES=ON ' +
'-DOGS_BUILD_GUI=ON ' +
'-DOGS_BUILD_UTILS=OFF ' +
'-DOGS_BUILD_TESTS=OFF ' +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment