Improve Windows build

Author: flanglet

CMakeLists.txt

@@ -4,7 +4,8 @@ include(GNUInstallDirs)
 
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
-#set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 #set(CMAKE_CXX_COMPILER "clang++")
 
 # Set C standard (for TestAPI.c)
@@ -20,14 +21,16 @@ if(CONCURRENCY_DISABLED)
     add_definitions(-DCONCURRENCY_DISABLED)
 endif()
 
-set(COMMON_FLAGS "-Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
-set(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
-
 if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(COMMON_FLAGS "/W4 /O2 /DNDEBUG")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} /GR-")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+else()
+    set(COMMON_FLAGS "-Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -fno-rtti")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
 endif()
+set(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
 # Source files
 set(LIB_COMMON_SOURCES

src/types.hpp

@@ -157,7 +157,7 @@ limitations under the License.
     // __cplusplus always defaults to 199711L (aka C++98) !!! (unless
     // the extra option /Zc:__cplusplus is added to the command line).
     // Otherwise, using the _MSVC_LANG macro returns the proper C++ version.
-    #if __cplusplus >= 201103L
+    #if (__cplusplus >= 201103L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201103L)
        // C++ 11 or higher
        #define FINAL final
        #define NOEXCEPT noexcept
@@ -197,7 +197,12 @@ limitations under the License.
              #endif
        #endif
 
-       #if !defined(nullptr)
+       #if !defined(nullptr) && \
+           ((defined(_MSC_VER) && (_MSC_VER < 1600)) || \
+            (defined(__GNUC__) && !defined(__clang__) && \
+             ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ < 6)))) || \
+            (defined(__clang__) && \
+             ((__clang_major__ < 3) || ((__clang_major__ == 3) && (__clang_minor__ < 1)))))
           #define nullptr NULL
        #endif
     #endif