From 99186aac3e325bd5410e4796edfa70db46840250 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Fri, 10 May 2013 19:23:54 +0000 Subject: [PATCH] dlls --- CMakeLists.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 237af6049e..e8ec387f08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1158,22 +1158,21 @@ target_link_libraries(gmsh ${LINK_LIBRARIES}) # Windows specific linker options if(WIN32 AND NOT MSVC OR CYGWIN) - set_target_properties(gmsh shared PROPERTIES - LINK_FLAGS "-Wl,--stack,16777216 -mwindows") + set(FLAGS "-Wl,--stack,16777216 -mwindows") if(HAVE_64BIT_SIZE_T) - set_target_properties(gmsh PROPERTIES - LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win64Icon.res") + set(FLAGS "${FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win64Icon.res") else(HAVE_64BIT_SIZE_T) - set_target_properties(gmsh PROPERTIES - LINK_FLAGS "${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win32Icon.res") + set(FLAGS "${FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win32Icon.res") endif(HAVE_64BIT_SIZE_T) if(ENABLE_BUILD_DYNAMIC) + set_target_properties(gmsh PROPERTIES + LINK_FLAGS "${FLAGS} -Wl,--enable-auto-import") set_target_properties(shared PROPERTIES PREFIX "lib" - LINK_FLAGS "-Wl,--export-all-symbols") - set_target_properties(gmsh PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import") + LINK_FLAGS "${FLAGS} -Wl,--export-all-symbols") else(ENABLE_BUILD_DYNAMIC) - set_target_properties(gmsh PROPERTIES LINK_FLAGS "-static") + 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) -- GitLab