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

[CMake] Fixed shared libs installation on Win and Linux.

parent 8dc232a5
No related branches found
No related tags found
No related merge requests found
......@@ -34,3 +34,8 @@ cpack_add_component(ogs_cli
DESCRIPTION "The command line interface for OpenGeoSys."
GROUP Applications
)
if(NOT APPLE)
include(packaging/InstallDependencies)
InstallDependencies(ogs)
endif()
......@@ -115,3 +115,8 @@ 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)
include(packaging/InstallDependencies)
InstallDependencies(DataExplorer)
endif()
......@@ -290,3 +290,4 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/BaseLib/BuildInfo.cpp.in"
"${CMAKE_CURRENT_BINARY_DIR}/BaseLib/BuildInfo.cpp" @ONLY)
include(scripts/cmake/MarkVariablesAdvanced.cmake)
include(scripts/cmake/packaging/GetDependencies.cmake)
......@@ -78,7 +78,7 @@ if(NOT OGS_USE_CONAN)
include_directories(SYSTEM ${VTK_DIR}/../ThirdParty/netcdf/vtknetcdf/cxx)
endif()
find_package(Eigen3 REQUIRED)
find_package(Eigen3 3.2.9 REQUIRED)
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
## pthread, is a requirement of logog ##
......
......@@ -327,4 +327,4 @@ macro(conan_cmake_run)
conan_basic_setup()
endif()
endif()
endmacro()
\ No newline at end of file
endmacro()
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