Skip to content

Commit d6f9674

Browse files
committed
Updates of CMake.
1 parent 20b3610 commit d6f9674

3 files changed

+9
-3
lines changed

CMake.vars.example.Linux

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
# BASIC CONFIGURATION
66

77
# Global
8-
# Generate static libs (instead of dynamic)
9-
set(HERMES_STATIC_LIBS NO)
8+
# Generate static libs (instead of dynamic - when this option is disabled, dynamic library is built and therefore you may encounter problems with static library dependencies)
9+
set(HERMES_STATIC_LIBS YES)
10+
1011
# Target path
1112
set(CMAKE_INSTALL_PREFIX "/usr/local")
1213

CMake.vars.example.Windows

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# Global
88
# Generate static libs (instead of dynamic)
99
set(HERMES_STATIC_LIBS NO)
10+
1011
# Target path
1112
set(CMAKE_INSTALL_PREFIX "d:/hpfem/hermes/dependencies")
1213

CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ project(hermes)
3030

3131
# Global
3232
# Generate static libs (instead of dynamic)
33-
set(HERMES_STATIC_LIBS NO)
33+
if(MSVC)
34+
set(HERMES_STATIC_LIBS NO)
35+
else()
36+
set(HERMES_STATIC_LIBS YES)
37+
endif()
3438

3539
# HermesCommon
3640
# These are ignored for MSVC (where debug / release are handled differently)

0 commit comments

Comments
 (0)