Changeset 9595

Timestamp:

Mar 28, 2013, 11:09:38 PM (12 years ago)

Author:

landauf

Message:

merged r9594 to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -91 +91 @@
   # these get written to the *vcproj.yourPCname.yourname.user
   IF(MSVC)
+    IF(CMAKE_CL_64)
+      SET(MSVC_PLATFORM "x64")
+    ELSE()
+      SET(MSVC_PLATFORM "Win32")
+    ENDIF()
     IF(MSVC10)
       CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/template.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}.vcxproj.user")

code/trunk/src/CMakeLists.txt

@@ -78 +78 @@
 
 
-IF(MSVC)
-  IF(CMAKE_CL_64)
-    SET(MSVC_PLATFORM "x64")
-  ELSE()
-    SET(MSVC_PLATFORM "Win32")
-  ENDIF()
-ENDIF(MSVC)
-
 # Apple Mac OS X specific build settings
 IF(APPLE)