Clean up the 64-bit handling a bit. Trust CMake to tell use when we have a

64-bit target, and we don't actually use the WIN64 variable anywhere.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4317 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e855c407fe1de6760481a26bcfa60008cf2d1e1b..9c692b9134b9fcbadcc73adcd48d5839955e4420 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,7 @@ if(MSVC)
   add_definitions(-wd4244 -wd4267 -wd4800 -wd4996)
 endif()
 
-# Detect whether compiler is 64-bit
-if((MSVC AND CMAKE_CL_64) OR (CMAKE_SIZEOF_VOID_P MATCHES 8))
-  set(64BIT 1)
-  set(WIN64 1)
-endif()
-
-if(64BIT)
+if(CMAKE_CL_64)
   message(STATUS "64-bit build")
 else()
   message(STATUS "32-bit build")

diff --git a/win/installer/CMakeLists.txt b/win/installer/CMakeLists.txt
index 0324fe4319b2d17391b3b3b44b82e61a29172ce3..e09242c75ea0d59196cb66aacf4314535818300f 100644 (file)
--- a/win/installer/CMakeLists.txt
+++ b/win/installer/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(64BIT)
+if(CMAKE_CL_64)
   set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
   set(INST_DEFS -DWIN64)
 else()