[Orxonox-commit 2675] r7380 - code/trunk/src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-08 15:52:36 +0200 (Wed, 08 Sep 2010)
New Revision: 7380

Modified:
   code/trunk/src/OrxonoxConfig.cmake
   code/trunk/src/SpecialConfig.h.in
Log:
Removed workaround that was already worked around by CMake.

Modified: code/trunk/src/OrxonoxConfig.cmake
===================================================================
--- code/trunk/src/OrxonoxConfig.cmake	2010-09-08 13:34:29 UTC (rev 7379)
+++ code/trunk/src/OrxonoxConfig.cmake	2010-09-08 13:52:36 UTC (rev 7380)
@@ -78,13 +78,6 @@
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
 
-# XCode and Visual Studio support multiple configurations. In order to tell
-# about the active one we have to define the macro for each configuration
-ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=Debug"          Debug)
-ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=Release"        Release)
-ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=RelWithDebInfo" RelWithDebInfo)
-ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=MinSizeRel"     MinSizeRel)
-
 ############## Configured Headers ###############
 
 SET(GENERATED_FILE_COMMENT

Modified: code/trunk/src/SpecialConfig.h.in
===================================================================
--- code/trunk/src/SpecialConfig.h.in	2010-09-08 13:34:29 UTC (rev 7379)
+++ code/trunk/src/SpecialConfig.h.in	2010-09-08 13:52:36 UTC (rev 7380)
@@ -40,7 +40,6 @@
 #define _SpecialConfig_H__
 
 #include "OrxonoxConfig.h"
-#include <boost/preprocessor/stringize.hpp>
 
 /**
 @def CEGUILUA_USE_INTERNAL_LIBRARY
@@ -91,9 +90,9 @@
     const char dataDevDirectory[]           = "@DATA_DIRECTORY@";
     const char externalDataDevDirectory[]   = "@EXTERNAL_DATA_DIRECTORY@";
 #ifdef CMAKE_CONFIGURATION_TYPES
-    const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
-    const char configDevDirectory[]         = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
-    const char logDevDirectory[]            = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
+    const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@/" CMAKE_INTDIR;
+    const char configDevDirectory[]         = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" CMAKE_INTDIR;
+    const char logDevDirectory[]            = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    CMAKE_INTDIR;
 #else
     const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@";
     const char configDevDirectory[]         = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@";