Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9595


Ignore:
Timestamp:
Mar 28, 2013, 11:09:38 PM (11 years ago)
Author:
landauf
Message:

merged r9594 to trunk

Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/cmake/tools/TargetUtilities.cmake

    r9550 r9595  
    9191  # these get written to the *vcproj.yourPCname.yourname.user
    9292  IF(MSVC)
     93    IF(CMAKE_CL_64)
     94      SET(MSVC_PLATFORM "x64")
     95    ELSE()
     96      SET(MSVC_PLATFORM "Win32")
     97    ENDIF()
    9398    IF(MSVC10)
    9499      CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/src/template.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}.vcxproj.user")
  • code/trunk/src/CMakeLists.txt

    r9550 r9595  
    7878
    7979
    80 IF(MSVC)
    81   IF(CMAKE_CL_64)
    82     SET(MSVC_PLATFORM "x64")
    83   ELSE()
    84     SET(MSVC_PLATFORM "Win32")
    85   ENDIF()
    86 ENDIF(MSVC)
    87 
    8880# Apple Mac OS X specific build settings
    8981IF(APPLE)
Note: See TracChangeset for help on using the changeset viewer.