Changeset 8351 for code/trunk/CMakeLists.txt

Timestamp:

Apr 28, 2011, 7:15:14 AM (13 years ago)

Author:

rgrieder

Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

• *Support for Mac OS X*
• Visual Studio 2010 support
• Bullet library update to 2.77
• OIS library update to 1.3
• Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
• Improved install target
• Compiles now with GCC 4.6
• Ogre Cg Shader plugin activated for Linux if available
• And of course lots of bug fixes

There are also some regressions:

• No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
• In game console is not working in main menu for CEGUI 0.7
• Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
• And of course lots of new bugs we don't yet know about

File:

• code/trunk/CMakeLists.txt (modified) (4 diffs)

code/trunk/CMakeLists.txt

@@ -24 +24 @@
  #
 
+# Defined LINUX
+IF(UNIX AND NOT APPLE)
+  SET(LINUX TRUE)
+ENDIF()
+
 IF(WIN32)
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+  IF(MSVC10)
+    CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3 FATAL_ERROR)
+  ELSE()
+    CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+  ENDIF()
 ELSE()
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.6   FATAL_ERROR)
+  CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
 ENDIF()
 
@@ -57 +66 @@
 SET(DEFAULT_CONFIG_PATH  config)
 SET(DEFAULT_LOG_PATH     log)
+SET(DEFAULT_BUNDLE_PATH  bundle)
 
 # Set output directories
@@ -98 +108 @@
 ENDIF()
 
+# Debug builds can not be installed
+INSTALL(SCRIPT cmake/InstallCheck.cmake)
+
 # Enable expensive optimisations: use this for a binary release build
 OPTION(ORXONOX_RELEASE "Enable when building restributable releases" FALSE)
 
+IF(APPLE)
+  # Set 10.5 as the base SDK by default
+  SET(XCODE_ATTRIBUTE_SDKROOT macosx10.5)
+
+  # 10.6 sets x86_64 as the default architecture.
+  # Because Carbon isn't supported on 64-bit and we still need it, force the architectures to ppc and i386
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+    SET(CMAKE_OSX_ARCHITECTURES "i386")
+  ENDIF()
+  IF(CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
+    SET(CMAKE_OSX_ARCHITECTURES "ppc")
+  ENDIF()
+  IF(NOT CMAKE_OSX_ARCHITECTURES)
+    SET(CMAKE_OSX_ARCHITECTURES "i386")
+  ENDIF()
+ENDIF()
+
 ########### Subfolders and Subscripts ###########
+
+# General build and compiler options and configurations
+INCLUDE(CompilerConfig)
 
 # Library finding
 INCLUDE(LibraryConfig)
-
-# General build and compiler options and configurations
-INCLUDE(CompilerConfig)
 
 # Configure installation paths and options
@@ -121 +151 @@
 ADD_SUBDIRECTORY(bin)
 
+# System specific files (mostly for installation)
+ADD_SUBDIRECTORY(contrib)
+
 # Last but not least: Try to make a doc target with Doxygen
 ADD_SUBDIRECTORY(doc)
+
+########### CPack Packaging ###########
+
+# Currently only testing on Apple
+#IF(APPLE)
+#  INCLUDE(BundleConfig)
+#ENDIF(APPLE)