Fix c++11 detection issue on windows. Fix ilmbase DLL export warnings

AcademySoftwareFoundation · Aug 8, 2018 · 9885f97 · 9885f97
1 parent 2811d5c
commit 9885f97
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
@@ -142,9 +142,10 @@ ENDIF ()
 
 IF (FORCE_CXX03)
   FILE ( APPEND  ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "#define ILMBASE_FORCE_CXX03 1\n" )
-ELSE ()
+ELIF (NOT WIN32)
   # really only care about c++11 right now for the threading bits, but this can be changed to 14
   # when needed...
+  # Note that the __cplusplus check is not valid under MSVC
   FILE ( APPEND  ${CMAKE_CURRENT_BINARY_DIR}/config/IlmBaseConfig.h "#if __cplusplus < 201103L\n# error \"Modern C++ 11/14 not enabled but force cxx03 not set\"\n#endif\n" )
 ENDIF ()