From: Diederick Niehorster <dcnieho@gmail.com>
Date: Mon, 12 Mar 2012 07:26:37 +0000 (+0000)
Subject: cleaneup \machine setting for MSVC, now only for 64bit static libs, only
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=8ce1f80392136d7a794bab5d60d9053dd53684a4;p=freeglut

cleaneup \machine setting for MSVC, now only for 64bit static libs, only
onwe for which needed. Added a comment showing why its needed


git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1119 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fe01f5..0fdc595 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,22 +216,14 @@ IF(WIN32)
 	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()