Skip to content

Commit

Permalink
Minor addedum to CMakeLists.txt. Refs #4355
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Jun 4, 2020
1 parent 7a3348c commit 63e5702
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ elseif (MSVC)
endif ()
if (MSVC_VERSION GREATER 1914)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /experimental:external /external:W2")
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "/external:I ")
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "/external:I ")
endif ()
# exporting symbols for shared libraries needs to enabled explicitly
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
Expand Down Expand Up @@ -142,6 +142,7 @@ endif (APPLE)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND WIN32)
option(USE_MINGW_64BITS "Use 64 bits libraries for the compilation with MinGW" true)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32 -D_WIN32_WINNT=0x0501")
set(MINGW32 1)
endif ()

# Check if libraries have to be found, depending on SUMO_LIBRARIES
Expand Down
13 changes: 8 additions & 5 deletions src/config.h.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Check if we're using Microsoft Visual Studio */
/* Macros for Microsoft Visual Studio */
#ifdef _MSC_VER

/* Disable "decorated name length exceeded, name was truncated" warnings. */
Expand Down Expand Up @@ -29,11 +29,14 @@
#define FOX_CONSTRUCTOR(classname) __pragma(warning(suppress: 26495)) \
classname() {}

/* GNU Compiler */
/* Macros for GNU Compiler */
#else

/* defined if we're using MINGW32 */
#cmakedefine MINGW32

/* Windows (MinGW32) */
#ifdef __MINGW32__
#ifdef MINGW32

/* Define WIN32 */
#ifndef WIN32
Expand All @@ -42,8 +45,8 @@

/* Define for dynamic Fox linkage */
#define FOXDLL 1
/* Define default constructor for FOX moduls (MinGW32) */

/* Define default constructor for FOX moduls (MinGW32) */
#define FOX_CONSTRUCTOR(classname) classname() {}

/* Linux and OS */
Expand Down

0 comments on commit 63e5702

Please sign in to comment.