diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-03-08 21:25:30 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-03-08 21:25:30 +0000 |
| commit | 0ae428950e2a20ead42222f9f4752193fa7691c6 (patch) | |
| tree | 4abd1a110b4a680ff6941cdca32aad89f11ad324 /CMakeScripts | |
| parent | Apply the Albin Penner fix for bug 1663362 (diff) | |
| download | inkscape-0ae428950e2a20ead42222f9f4752193fa7691c6.tar.gz inkscape-0ae428950e2a20ead42222f9f4752193fa7691c6.zip | |
CMake: Assume mingw-w64 for MinGW builds
(should be a safe assumption, if not let me know...)
This resolves the "mingw-w64" vs. "MinGW 64-bit" ambiguity of the "HAVE_MINGW64" cmake variable (which worked before as devlibs = 32bit = mingw; devlibs64 = 64-bit = mingw-w64), but is not senseful for newer 32-bit MinGW builds that are based on mingw-w64, too.
(bzr r15579)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 90df50c6d..29ccb3a91 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -23,21 +23,16 @@ list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11") if(WIN32) # Set the link and include directories get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) - - # MinGW supplied STL does not define these floating point constants.. :/ - add_definitions(-DFLT_EPSILON=1e-9) - add_definitions(-DFLT_MAX=1e+37) - add_definitions(-DFLT_MIN=1e-37) list(APPEND INKSCAPE_LIBS "-lmscms") list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") + + list(APPEND INKSCAPE_LIBS "-lgomp") + list(APPEND INKSCAPE_LIBS "-lwinpthread") if(HAVE_MINGW64) - list(APPEND INKSCAPE_LIBS "-lgomp") - list(APPEND INKSCAPE_LIBS "-lwinpthread") - list(APPEND INKSCAPE_CXX_FLAGS "-m64") else() list(APPEND INKSCAPE_CXX_FLAGS "-m32") |