Revision: 4317
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4317&view=rev
Author: ossman_
Date: 2011-03-03 12:35:04 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/win/installer/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-03-03 12:32:15 UTC (rev 4316)
+++ trunk/CMakeLists.txt 2011-03-03 12:35:04 UTC (rev 4317)
@@ -60,13 +60,7 @@
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")
Modified: trunk/win/installer/CMakeLists.txt
===================================================================
--- trunk/win/installer/CMakeLists.txt 2011-03-03 12:32:15 UTC (rev 4316)
+++ trunk/win/installer/CMakeLists.txt 2011-03-03 12:35:04 UTC (rev 4317)
@@ -1,4 +1,4 @@
-if(64BIT)
+if(CMAKE_CL_64)
set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
set(INST_DEFS -DWIN64)
else()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
