minor fix on CMakeLists for checking MSVC_VERSION
authorJinrong Xie <jrxie@ucdavis.edu>
Mon, 29 Jun 2015 10:09:48 +0000 (10:09 +0000)
committerDiederick Niehorster <dcnieho@gmail.com>
Mon, 29 Jun 2015 10:09:48 +0000 (10:09 +0000)
(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)

(cherry picked from commit ce15044f7362943aee7d465bf20310ba02991dae)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1767 7f0cb862-5218-0410-a997-914c9d46530a

CMakeLists.txt

index 2467cd4..7d7d685 100644 (file)
@@ -273,7 +273,11 @@ IF(WIN32)
         SET( CMAKE_DEBUG_POSTFIX "d" )
     ENDIF(MSVC)
     
-    IF(NOT(MSVC_VERSION LESS "1300"))
+    IF(NOT(MSVC_VERSION LESS "1600"))
+    # minimum requirement for WM_TOUCH device
+        ADD_DEFINITIONS(-D_WIN32_WINNT=0x0601)
+        ADD_DEFINITIONS(-DWINVER=0x0601)
+    ELSEIF(NOT(MSVC_VERSION LESS "1300"))
     # minimum requirement for spaceball device
         ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
         ADD_DEFINITIONS(-DWINVER=0x0501)
@@ -283,11 +287,6 @@ IF(WIN32)
         ADD_DEFINITIONS(-DWINVER=0x0500)
     ENDIF()
 
-    IF(NOT(MSVC_VERSION LESS "1600"))
-    # minimum requirement for WM_TOUCH device
-        ADD_DEFINITIONS(-D_WIN32_WINNT=0x0601)
-        ADD_DEFINITIONS(-DWINVER=0x0601)
-    ENDIF()
 ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCC)