From 916d3800762d727ad44e84a4eaa0dee6adbb8d0a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 2 Oct 2015 19:09:34 +0000
Subject: [PATCH] tweak
---
CMakeLists.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8babd1c6bc..6d890eb27d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1502,26 +1502,26 @@ if(WIN32 AND NOT MSVC OR CYGWIN)
else(HAVE_64BIT_SIZE_T)
set(FLAGS "${FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win32Icon.res")
endif(HAVE_64BIT_SIZE_T)
- if(ENABLE_BUILD_DYNAMIC)
+ if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
set(FLAGS "${FLAGS} -Wl,-Bstatic -lgfortran")
set_target_properties(gmsh PROPERTIES
LINK_FLAGS "${FLAGS} -Wl,--enable-auto-import")
set(LIBGMSH_DEF "libGmsh-${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.def")
set_target_properties(shared PROPERTIES PREFIX "lib"
LINK_FLAGS "${FLAGS} -Wl,--export-all-symbols,--output-def,${LIBGMSH_DEF}")
- else(ENABLE_BUILD_DYNAMIC)
+ else(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
set_target_properties(gmsh PROPERTIES
LINK_FLAGS "${FLAGS} -static")
# remove -Wl,-Bdynamic flags
set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)
set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
- endif(ENABLE_BUILD_DYNAMIC)
+ endif(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
elseif(MSVC)
set_target_properties(gmsh PROPERTIES LINK_FLAGS
"/STACK:16777216 /SAFESEH:NO")
- if(ENABLE_BUILD_DYNAMIC)
+ if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
- endif(ENABLE_BUILD_DYNAMIC)
+ endif(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)
endif(WIN32 AND NOT MSVC OR CYGWIN)
# parser target
--
GitLab