Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8057 for code/branches/kicklib


Ignore:
Timestamp:
Mar 11, 2011, 3:26:56 AM (14 years ago)
Author:
rgrieder
Message:

Added some extra wursts for Visual Studio 2010 to the build system.

Location:
code/branches/kicklib
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/kicklib/cmake/CompilerConfigMSVC.cmake

    r7818 r8057  
    6464SET_COMPILER_FLAGS("-MD  -O2 -Zi -DNDEBUG"       RelWithDebInfo CACHE)
    6565SET_COMPILER_FLAGS("-MD  -O1     -DNDEBUG"       MinSizeRel     CACHE)
    66 ADD_COMPILER_FLAGS("-D_SECURE_SCL=0"       MSVC9 ReleaseAll     CACHE)
     66
     67# No iterator checking for release builds (MSVC 8 dosn't understand this though)
     68ADD_COMPILER_FLAGS("-D_SECURE_SCL=0" ReleaseAll CACHE)
     69
     70# Newer MSVC versions come with std::shared_ptr which conflicts with
     71# boost::shared_ptr in cpptcl. And since we don't yet use the new C++ standard
     72# anyway, disable it completely.
     73ADD_COMPILER_FLAGS("-D_HAS_CPP0X=0" CACHE)
    6774
    6875# Use Link time code generation for Release config if ORXONOX_RELEASE is defined
  • code/branches/kicklib/cmake/LibraryConfig.cmake

    r7956 r8057  
    5959  ELSEIF(MSVC90)
    6060    SET(_compiler_prefix msvc9)
     61  ELSEIF(MSVC100)
     62    SET(_compiler_prefix msvc10)
    6163  ENDIF()
    6264  FIND_PATH(DEPENDENCY_PACKAGE_DIR
  • code/branches/kicklib/cmake/PackageConfigMSVC.cmake

    r7818 r8057  
    3636
    3737  # Choose right MSVC version
    38   STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
     38  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
    3939         _msvc_version "${CMAKE_GENERATOR}")
    4040
  • code/branches/kicklib/cmake/tools/TargetUtilities.cmake

    r7980 r8057  
    223223  IF(_arg_ORXONOX_EXTERNAL)
    224224    REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    225     ADD_COMPILER_FLAGS("-w")
     225    ADD_COMPILER_FLAGS("-w" NOT MSVC)
     226    ADD_COMPILER_FLAGS("-W0" MSVC)
    226227  ENDIF()
    227228
  • code/branches/kicklib/src/CMakeLists.txt

    r7960 r8057  
    164164    SET(MSVC_PLATFORM "Win32")
    165165  ENDIF()
    166   STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
    167          VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
    168   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
     166  IF(MSVC10)
     167    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcxproj.user")
     168  ELSE()
     169    STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
     170           VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
     171    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
     172  ENDIF()
    169173ENDIF(MSVC)
    170174
Note: See TracChangeset for help on using the changeset viewer.