Changeset 7380 for code

Timestamp:

Sep 8, 2010, 3:52:36 PM (14 years ago)

Author:

rgrieder

Message:

Removed workaround that was already worked around by CMake.

Location:

code/trunk/src

Files:

• OrxonoxConfig.cmake (modified) (1 diff)
• SpecialConfig.h.in (modified) (2 diffs)

code/trunk/src/OrxonoxConfig.cmake

@@ -79 +79 @@
 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 ###############
 

code/trunk/src/SpecialConfig.h.in

@@ -41 +41 @@
 
 #include "OrxonoxConfig.h"
-#include <boost/preprocessor/stringize.hpp>
 
 /**
@@ -92 +91 @@
     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@";