[Orxonox-commit 3369] r8057 - in code/branches/kicklib: cmake cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-11 03:26:56 +0100 (Fri, 11 Mar 2011)
New Revision: 8057

Added:
   code/branches/kicklib/src/orxonox-main.vcxproj.user.in
Modified:
   code/branches/kicklib/cmake/CompilerConfigMSVC.cmake
   code/branches/kicklib/cmake/LibraryConfig.cmake
   code/branches/kicklib/cmake/PackageConfigMSVC.cmake
   code/branches/kicklib/cmake/tools/TargetUtilities.cmake
   code/branches/kicklib/src/CMakeLists.txt
Log:
Added some extra wursts for Visual Studio 2010 to the build system.

Modified: code/branches/kicklib/cmake/CompilerConfigMSVC.cmake
===================================================================
--- code/branches/kicklib/cmake/CompilerConfigMSVC.cmake	2011-03-10 16:52:31 UTC (rev 8056)
+++ code/branches/kicklib/cmake/CompilerConfigMSVC.cmake	2011-03-11 02:26:56 UTC (rev 8057)
@@ -63,8 +63,15 @@
 SET_COMPILER_FLAGS("-MD  -O2     -DNDEBUG"       Release        CACHE)
 SET_COMPILER_FLAGS("-MD  -O2 -Zi -DNDEBUG"       RelWithDebInfo CACHE)
 SET_COMPILER_FLAGS("-MD  -O1     -DNDEBUG"       MinSizeRel     CACHE)
-ADD_COMPILER_FLAGS("-D_SECURE_SCL=0"       MSVC9 ReleaseAll     CACHE)
 
+# No iterator checking for release builds (MSVC 8 dosn't understand this though)
+ADD_COMPILER_FLAGS("-D_SECURE_SCL=0" ReleaseAll CACHE)
+
+# Newer MSVC versions come with std::shared_ptr which conflicts with
+# boost::shared_ptr in cpptcl. And since we don't yet use the new C++ standard
+# anyway, disable it completely.
+ADD_COMPILER_FLAGS("-D_HAS_CPP0X=0" CACHE)
+
 # Use Link time code generation for Release config if ORXONOX_RELEASE is defined
 IF(ORXONOX_RELEASE)
   ADD_COMPILER_FLAGS("-GL" ReleaseAll CACHE)

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-03-10 16:52:31 UTC (rev 8056)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-03-11 02:26:56 UTC (rev 8057)
@@ -58,6 +58,8 @@
     SET(_compiler_prefix msvc8)
   ELSEIF(MSVC90)
     SET(_compiler_prefix msvc9)
+  ELSEIF(MSVC100)
+    SET(_compiler_prefix msvc10)
   ENDIF()
   FIND_PATH(DEPENDENCY_PACKAGE_DIR
     NAMES version.txt

Modified: code/branches/kicklib/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-03-10 16:52:31 UTC (rev 8056)
+++ code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-03-11 02:26:56 UTC (rev 8057)
@@ -35,7 +35,7 @@
   ENDIF()
 
   # Choose right MSVC version
-  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
+  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
          _msvc_version "${CMAKE_GENERATOR}")
 
   SET(DEP_INCLUDE_DIR ${DEPENDENCY_PACKAGE_DIR}/include)

Modified: code/branches/kicklib/cmake/tools/TargetUtilities.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-03-10 16:52:31 UTC (rev 8056)
+++ code/branches/kicklib/cmake/tools/TargetUtilities.cmake	2011-03-11 02:26:56 UTC (rev 8057)
@@ -222,7 +222,8 @@
   # No warnings needed from third party libraries
   IF(_arg_ORXONOX_EXTERNAL)
     REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-    ADD_COMPILER_FLAGS("-w")
+    ADD_COMPILER_FLAGS("-w" NOT MSVC)
+    ADD_COMPILER_FLAGS("-W0" MSVC)
   ENDIF()
 
   # Don't compile header files

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-03-10 16:52:31 UTC (rev 8056)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-03-11 02:26:56 UTC (rev 8057)
@@ -163,9 +163,13 @@
   ELSE()
     SET(MSVC_PLATFORM "Win32")
   ENDIF()
-  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
-         VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
+  IF(MSVC10)
+    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcxproj.user")
+  ELSE()
+    STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
+           VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
+    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox-main.vcproj.user")
+  ENDIF()
 ENDIF(MSVC)
 
 #################### Doxygen ####################

Added: code/branches/kicklib/src/orxonox-main.vcxproj.user.in
===================================================================
--- code/branches/kicklib/src/orxonox-main.vcxproj.user.in	                        (rev 0)
+++ code/branches/kicklib/src/orxonox-main.vcxproj.user.in	2011-03-11 02:26:56 UTC (rev 8057)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|${MSVC_PLATFORM}'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>
+    <LocalDebuggerWorkingDirectory>$(Outdir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|${MSVC_PLATFORM}'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>
+    <LocalDebuggerWorkingDirectory>$(Outdir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|${MSVC_PLATFORM}'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>
+    <LocalDebuggerWorkingDirectory>$(Outdir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|${MSVC_PLATFORM}'">
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerEnvironment>PATH=${RUNTIME_LIBRARY_DIRECTORY};%PATH%</LocalDebuggerEnvironment>
+    <LocalDebuggerWorkingDirectory>$(Outdir)</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
+</Project>


Property changes on: code/branches/kicklib/src/orxonox-main.vcxproj.user.in
___________________________________________________________________
Added: svn:eol-style
   + native