[Orxonox-commit 4925] r9594 - in code/branches/core6: cmake/tools src

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-28 23:07:49 +0100 (Thu, 28 Mar 2013)
New Revision: 9594

Modified:
   code/branches/core6/cmake/tools/TargetUtilities.cmake
   code/branches/core6/src/CMakeLists.txt
Log:
fixed msvc configuration

Modified: code/branches/core6/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/core6/cmake/tools/TargetUtilities.cmake	2013-03-27 22:17:45 UTC (rev 9593)
+++ code/branches/core6/cmake/tools/TargetUtilities.cmake	2013-03-28 22:07:49 UTC (rev 9594)
@@ -90,6 +90,11 @@
   # right values. When starting the solution for the first time,
   # 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")
     ELSE()

Modified: code/branches/core6/src/CMakeLists.txt
===================================================================
--- code/branches/core6/src/CMakeLists.txt	2013-03-27 22:17:45 UTC (rev 9593)
+++ code/branches/core6/src/CMakeLists.txt	2013-03-28 22:07:49 UTC (rev 9594)
@@ -77,14 +77,6 @@
 SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
 
 
-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)
   # On Apple we need to link to AppKit and Foundation frameworks