Changeset 2582 for code/branches/buildsystem2/cmake/ConfigMSVC.cmake

Timestamp:

Jan 9, 2009, 1:10:33 PM (15 years ago)

Author:

rgrieder

Message:

• Using dependency directory directly in root dir of a branch as primary folder (./libs resp. ./dependencies) Second priority is ../libs for MinGW and ../lib_dist/vc8/dependencies for msvc.
• Moved compiler and linker flags to ConfigPlatforms.cmake
• Solved additional libraries for ENet under MinGW directly in FindEnet.cmake

File:

• code/branches/buildsystem2/cmake/ConfigMSVC.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/ConfigMSVC.cmake

@@ -32 +32 @@
 
 IF (MSVC)
-  MESSAGE(STATUS "Running on MSVC. Using customized paths.")
-  SET(MSVC_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8")
+  MESSAGE(STATUS "Running on MSVC. Using customized paths and options.")
+
+  # Determine library directory
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8)
+    SET(MSVC_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8")
+  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/../lib_dist/vc8/dependencies/orxonox_vc8)
+    SET(MSVC_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/../lib_dist/vc8/dependencies/orxonox_vc8")
+  ELSE(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8)
+    MESSAGE(FATAL_ERROR "Could not find dependency directory for the Visual Studio libraries")
+  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/orxonox_vc8)
   MARK_AS_ADVANCED(MSVC_LIBRARY_DIR)
 
-  SET(BOOST_INCLUDEDIR ${MSVC_LIBRARY_DIR}/boost-1.35.0/include)
-  SET(BOOST_LIBRARYDIR ${MSVC_LIBRARY_DIR}/boost-1.35.0/lib)
-  SET(ENV{CEGUIDIR}    ${MSVC_LIBRARY_DIR}/cegui-0.6.1)
-  SET(ENV{ENETDIR}     ${MSVC_LIBRARY_DIR}/enet-1.2)
-  SET(ENV{ALUTDIR}     ${MSVC_LIBRARY_DIR}/freealut-1.1.0)
-  SET(ENV{OGGDIR}      ${MSVC_LIBRARY_DIR}/libogg-1.1.3)
-  SET(ENV{VORBISDIR}   ${MSVC_LIBRARY_DIR}/libvorbis-1.2.0)
-  SET(ENV{OPENALDIR}   ${MSVC_LIBRARY_DIR}/openal-1.1)
-  SET(ENV{LUA_DIR}     ${MSVC_LIBRARY_DIR}/lua-5.1.3)
-  SET(ENV{OGRE_HOME}   ${MSVC_LIBRARY_DIR}/ogre-1.4.9)
-  SET(TCL_INCLUDE_PATH ${MSVC_LIBRARY_DIR}/tcl-8.5.2/include)
-  SET(TCL_LIBRARY      ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
+  # Set variables for the include directories and the libraries
+  SET(BOOST_INCLUDEDIR       ${MSVC_LIBRARY_DIR}/boost-1.35.0/include)
+  SET(BOOST_LIBRARYDIR       ${MSVC_LIBRARY_DIR}/boost-1.35.0/lib)
+  SET(ENV{CEGUIDIR}          ${MSVC_LIBRARY_DIR}/cegui-0.6.1)
+  SET(ENV{ENETDIR}           ${MSVC_LIBRARY_DIR}/enet-1.2)
+  SET(ENV{ALUTDIR}           ${MSVC_LIBRARY_DIR}/freealut-1.1.0)
+  SET(ENV{OGGDIR}            ${MSVC_LIBRARY_DIR}/libogg-1.1.3)
+  SET(ENV{VORBISDIR}         ${MSVC_LIBRARY_DIR}/libvorbis-1.2.0)
+  SET(ENV{OPENALDIR}         ${MSVC_LIBRARY_DIR}/openal-1.1)
+  SET(ENV{LUA_DIR}           ${MSVC_LIBRARY_DIR}/lua-5.1.3)
+  SET(ENV{OGRE_HOME}         ${MSVC_LIBRARY_DIR}/ogre-1.4.9)
+  SET(TCL_INCLUDE_PATH       ${MSVC_LIBRARY_DIR}/tcl-8.5.2/include)
+  SET(TCL_LIBRARY            ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
   SET(TCL_FOUND TRUE)
-  SET(TCL_TCLSH        ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
+  # Do some hacking to avoid "Tclsh not found" message
+  SET(TCL_TCLSH              ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
   SET(TCL_TCLSH_FOUND TRUE)
-  SET(ZLIB_INCLUDE_DIR ${MSVC_LIBRARY_DIR}/zlib-1.2.3/include)
+  SET(ZLIB_INCLUDE_DIR       ${MSVC_LIBRARY_DIR}/zlib-1.2.3/include)
   SET(ZLIB_LIBRARY OPTIMIZED ${MSVC_LIBRARY_DIR}/zlib-1.2.3/lib/zlib.lib
                    DEBUG     ${MSVC_LIBRARY_DIR}/zlib-1.2.3/lib/zlib_d.lib)
   SET(ZLIB_FOUND TRUE)
+
+
+  # Set standard compiler flags
+  SET(CMAKE_C_FLAGS   "$ENV{CFLAGS}   ${ORXONOX_WARNING_FLAGS} -fPIC")
+  SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} ${ORXONOX_WARNING_FLAGS} -fPIC")
+  # These flags are added to the flags above
+  SET(CMAKE_C_FLAGS_DEBUG            "    -g -ggdb")
+  SET(CMAKE_CXX_FLAGS_DEBUG          "    -g -ggdb")
+  SET(CMAKE_C_FLAGS_RELEASE          "-O3          -DNDEBUG")
+  SET(CMAKE_CXX_FLAGS_RELEASE        "-O3          -DNDEBUG")
+  SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -ggdb -DNDEBUG")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -ggdb -DNDEBUG")
+  SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os          -DNDEBUG")
+  SET(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os          -DNDEBUG")
+
+  # Linker flags
+  SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
+  SET(CMAKE_EXE_LINKER_FLAGS    " --no-undefined")
+  SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
+  SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
 ENDIF (MSVC)