| --- gmsh-gmsh_4_7_1/CMakeLists.txt.orig 2020-11-16 16:30:16.000000000 +0100 |
| +++ gmsh-gmsh_4_7_1/CMakeLists.txt 2021-01-07 21:02:06.245413700 +0100 |
| @@ -211,8 +211,6 @@ |
| set(GMSH_OS "Windows") |
| set(WIN32 1) |
| add_definitions(-DWIN32) |
| - set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") |
| - set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so" ".lib" ".LIB" ".dll" ".DLL" ".dll.a") |
| endif() |
| endif() |
| else() |
| @@ -1709,7 +1713,7 @@ |
| |
| # Windows specific linker options |
| if(WIN32 AND NOT MSVC) |
| - set(FLAGS "-Wl,--stack,16777216 -static -municode") |
| + set(FLAGS "-Wl,--stack,16777216 -municode") |
| if(HAVE_FLTK) |
| set(FLAGS "${FLAGS} -mwindows") |
| else() |
| @@ -1721,7 +1725,7 @@ |
| set(FLAGS "${FLAGS} \"${CMAKE_CURRENT_SOURCE_DIR}/Fltk/Win32Icon.res\"") |
| endif() |
| set_target_properties(gmsh PROPERTIES LINK_FLAGS "${FLAGS}") |
| - if(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED) |
| + if(NOT (ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_SHARED)) |
| set_target_properties(shared PROPERTIES LINK_FLAGS -static) |
| endif() |
| # remove -Wl,-Bdynamic flags |
