Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7380


Ignore:
Timestamp:
Sep 8, 2010, 3:52:36 PM (10 years ago)
Author:
rgrieder
Message:

Removed workaround that was already worked around by CMake.

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/OrxonoxConfig.cmake

    r7163 r7380  
    7979CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
    8080
    81 # XCode and Visual Studio support multiple configurations. In order to tell
    82 # about the active one we have to define the macro for each configuration
    83 ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=Debug"          Debug)
    84 ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=Release"        Release)
    85 ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=RelWithDebInfo" RelWithDebInfo)
    86 ADD_COMPILER_FLAGS("-DCMAKE_BUILD_TYPE=MinSizeRel"     MinSizeRel)
    87 
    8881############## Configured Headers ###############
    8982
  • code/trunk/src/SpecialConfig.h.in

    r5781 r7380  
    4141
    4242#include "OrxonoxConfig.h"
    43 #include <boost/preprocessor/stringize.hpp>
    4443
    4544/**
     
    9291    const char externalDataDevDirectory[]   = "@EXTERNAL_DATA_DIRECTORY@";
    9392#ifdef CMAKE_CONFIGURATION_TYPES
    94     const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
    95     const char configDevDirectory[]         = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
    96     const char logDevDirectory[]            = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    BOOST_PP_STRINGIZE(CMAKE_BUILD_TYPE);
     93    const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@/" CMAKE_INTDIR;
     94    const char configDevDirectory[]         = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" CMAKE_INTDIR;
     95    const char logDevDirectory[]            = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    CMAKE_INTDIR;
    9796#else
    9897    const char moduleDevDirectory[]         = "@CMAKE_MODULE_OUTPUT_DIRECTORY@";
Note: See TracChangeset for help on using the changeset viewer.