Revision: 4322
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4322&view=rev
Author:   ossman_
Date:     2011-03-04 14:31:32 +0000 (Fri, 04 Mar 2011)

Log Message:
-----------
Restore workaround for CMake's broken 64-bit detection, but in a more
generic manner.

Modified Paths:
--------------
    trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt        2011-03-04 11:35:24 UTC (rev 4321)
+++ trunk/CMakeLists.txt        2011-03-04 14:31:32 UTC (rev 4322)
@@ -51,6 +51,14 @@
   endif()
 endif()
 
+# CMake 64-bit detection leaves a bit to be desired and is sometimes
+# not properly set. Specifically we see this with mingw64. Try to
+# detect this scenario and fix things.
+if(NOT CMAKE_CL_64 AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+  message(STATUS "WARNING: CMake misdetected 64-bit build. Fixing...")
+  set(CMAKE_CL_64 1)
+endif()
+
 if(MSVC)
   # Use the static C library for all build types
   foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits

Reply via email to