Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 29, 2009, 10:04:38 PM (16 years ago)
Author:
rgrieder
Message:

Rearranged CMake configuration code. I split serveral files in two and moved some code around.
There are no actual code changes!

Details:

  • Everything that involves library finding is in LibraryConfig.cmake. It includes other LibraryConfigXXX.cmake files that set specific options for certain platforms or package configurations (like MSVC or MinGW dependency package).
  • All build related code is in BuildConfig.cmake. The actual compiler configuration is done in BuildConfigXXX.cmake where XXX can be GCC or MSVC.
  • The changes above implied splitting FindOGRE.cmake in two (was going to do it anyway, but rather in a later commit) so that CheckOGREPlugins.cmake is now a separate module.
File:
1 copied

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake

    r2611 r2612  
    6767  SET(ZLIB_FOUND TRUE)
    6868
    69   #################### Compiler Flags #####################
    70 
    71   # /MD    Minimal Rebuild
    72   # /RTC1  Both basic runtime checks
    73   # /MD[d] Multithreaded [debug] DLL
    74   # /Zi    Program Database
    75   # /ZI    Program Database for Edit & Continue
    76   # /WX    Warning Level X
    77   # /wdX   Disable specific warning X
    78   SET(MSVC_CL_FLAGS "
    79     /D WIN32 /D __WIN32__ /D _WIN32 /D _WINDOWS
    80     /D BOOST_ALL_DYN_LINK
    81     /D OIS_DYNAMIC_LIB
    82     /D ZLIB_WINAPI
    83     /D LUA_BUILD_AS_DLL
    84     /D _CRT_SECURE_NO_WARNINGS
    85     /W3
    86     /EHsc
    87     /wd4522
    88     /wd4251
    89     /wd4800
    90   ")
    91   SET(CMAKE_C_FLAGS                  "${MSVC_CL_FLAGS}")
    92   SET(CMAKE_CXX_FLAGS                "${MSVC_CL_FLAGS}")
    93 
    94   # Note: ${CMAKE_C_FLAGS} get added to the specific ones
    95   SET(MSVC_CL_FLAGS_DEBUG            "/MDd /Od  /Zi /Gm /RTC1")
    96   SET(MSVC_CL_FLAGS_RELEASE          "/MD  /MP2 /D TOLUA_RELEASE")
    97   SET(CMAKE_C_FLAGS_DEBUG            "${MSVC_CL_FLAGS_DEBUG}")
    98   SET(CMAKE_CXX_FLAGS_DEBUG          "${MSVC_CL_FLAGS_DEBUG}")
    99   SET(CMAKE_C_FLAGS_RELEASE          "${MSVC_CL_FLAGS_RELEASE} /O2")
    100   SET(CMAKE_CXX_FLAGS_RELEASE        "${MSVC_CL_FLAGS_RELEASE} /O2")
    101   SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "${MSVC_CL_FLAGS_RELEASE} /O2 /Zi")
    102   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${MSVC_CL_FLAGS_RELEASE} /O2 /Zi")
    103   SET(CMAKE_C_FLAGS_MINSIZEREL       "${MSVC_CL_FLAGS_RELEASE} /O1")
    104   SET(CMAKE_CXX_FLAGS_MINSIZEREL     "${MSVC_CL_FLAGS_RELEASE} /O1")
    105 
    106   ##################### Linker Flags ######################
    107 
    108   SET(MSVC_LINKER_FLAGS                        "")
    109   SET(CMAKE_EXE_LINKER_FLAGS                   "${MSVC_LINKER_FLAGS}")
    110   SET(CMAKE_SHARED_LINKER_FLAGS                "${MSVC_LINKER_FLAGS}")
    111 
    112   # Note: ${CMAKE_EXE_LINKER_FLAGS} get added to the specific ones
    113   SET(MSVC_LINKER_FLAGS_DEBUG                  "/INCREMENTAL:YES")
    114   SET(MSVC_LINKER_FLAGS_RELEASE                "/INCREMENTAL:NO /OPT:REF /OPT:ICF")
    115   SET(CMAKE_EXE_LINKER_FLAGS_DEBUG             "${MSVC_LINKER_FLAGS_DEBUG}")
    116   SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG          "${MSVC_LINKER_FLAGS_DEBUG}")
    117   SET(CMAKE_EXE_LINKER_FLAGS_RELEASE           "${MSVC_LINKER_FLAGS_RELEASE}")
    118   SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE        "${MSVC_LINKER_FLAGS_RELEASE}")
    119   SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO    "${MSVC_LINKER_FLAGS_RELEASE}")
    120   SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${MSVC_LINKER_FLAGS_RELEASE}")
    121   SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL        "${MSVC_LINKER_FLAGS_RELEASE}")
    122   SET(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL     "${MSVC_LINKER_FLAGS_RELEASE}")
    123 
    12469  ######################### Misc ##########################
    12570
Note: See TracChangeset for help on using the changeset viewer.