[Freeglut-cvs] SF.net SVN: freeglut:[1119] trunk/freeglut/freeglut/CMakeLists.txt

[<dc...@us...>]

Revision: 1119
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1119&view=rev
Author:   dcnieho
Date:     2012-03-12 07:26:37 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
cleaneup \machine setting for MSVC, now only for 64bit static libs, only
onwe for which needed. Added a comment showing why its needed

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

Modified: trunk/freeglut/freeglut/CMakeLists.txt
===================================================================
--- trunk/freeglut/freeglut/CMakeLists.txt	2012-03-12 05:07:35 UTC (rev 1118)
+++ trunk/freeglut/freeglut/CMakeLists.txt	2012-03-12 07:26:37 UTC (rev 1119)
@@ -216,22 +216,14 @@
 	LIST(APPEND LIBS winmm)
 	IF(BUILD_SHARED_LIBS)
 		SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS)
-        IF (CMAKE_CL_64)
-            # 64bit build
-            SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
-        ELSE()
-            # 32bit build
-            SET_TARGET_PROPERTIES(freeglut PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
-        ENDIF()
 	ENDIF()
     IF(BUILD_STATIC_LIBS)
     	SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC)
+        # need to set machine:x64 for linker, at least for VC10, and
+        # doesn't hurt for older compilers:
+        # http://public.kitware.com/Bug/view.php?id=11240#c22768
         IF (CMAKE_CL_64)
-            # 64bit build
             SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
-        ELSE()
-            # 32bit build
-            SET_TARGET_PROPERTIES(freeglut_static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
         ENDIF()
 	ENDIF()
 ELSE()

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