From ce15044f7362943aee7d465bf20310ba02991dae Mon Sep 17 00:00:00 2001 From: Jinrong Xie Date: Tue, 26 May 2015 18:50:57 -0700 Subject: [PATCH] minor fix on CMakeLists for checking MSVC_VERSION --- freeglut/freeglut/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt index c9c0e70..73173cf 100644 --- a/freeglut/freeglut/CMakeLists.txt +++ b/freeglut/freeglut/CMakeLists.txt @@ -233,7 +233,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) @@ -243,11 +247,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)