Support MS VS2012

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9550205374d9e47ce5212f0a762c79f894780341..5f014f230c20d0fb66d84141f6a422b0f4d18db2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,9 +237,9 @@ if(WIN32)
         # endforeach(warning)
 
         set(MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS")
-        if (${MSVC_VERSION} EQUAL 1600)
+        if (${MSVC_VERSION} GREATER 1599)
             set( MSVC_LD_FLAGS "/FORCE:MULTIPLE" )
-        endif (${MSVC_VERSION} EQUAL 1600)
+        endif (${MSVC_VERSION} GREATER 1599)
     endif(MSVC)
 
     set(NOMINMAX 1)

diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake
index f46d51d06ac30129bfc7aa7e7705864624123f46..8466184d03b1902f1320420654e7297862834861 100644 (file)
--- a/CMakeModules/ConfigureMsvc3rdParty.cmake
+++ b/CMakeModules/ConfigureMsvc3rdParty.cmake
@@ -20,11 +20,13 @@ endif (MSVC)
 if (MSVC AND MSVC_3RDPARTY_ROOT)
     message(STATUS "3rdparty files located in ${MSVC_3RDPARTY_ROOT}")
     set( OSG_MSVC "msvc" )
-    if (${MSVC_VERSION} EQUAL 1600)
+    if (${MSVC_VERSION} EQUAL 1700)
+        set( OSG_MSVC ${OSG_MSVC}110 )
+    elseif (${MSVC_VERSION} EQUAL 1600)
         set( OSG_MSVC ${OSG_MSVC}100 )
-    else (${MSVC_VERSION} EQUAL 1600)
+    else (${MSVC_VERSION} EQUAL 1700)
         set( OSG_MSVC ${OSG_MSVC}90 )
-    endif (${MSVC_VERSION} EQUAL 1600)
+    endif (${MSVC_VERSION} EQUAL 1700)
     if (CMAKE_CL_64)
         set( OSG_MSVC ${OSG_MSVC}-64 )
         set( MSVC_3RDPARTY_DIR 3rdParty.x64 )