From 2c12c9eb8d63cabac2d4113b4f54fdf53da8368c Mon Sep 17 00:00:00 2001 From: Jinrong Xie Date: Mon, 29 Jun 2015 10:09:48 +0000 Subject: [PATCH] minor fix on CMakeLists for checking MSVC_VERSION (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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2467cd4..7d7d685 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- 1.7.10.4