Changeset 11278 for code/branches

Timestamp:

Nov 8, 2016, 9:05:10 AM (8 years ago)

Author:

ahedges

Message:

comment out some stuff and update the cmake file for macOS 10.12

Location:

code/branches/mac_HS16

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/CopyLibPhase.cmake (added)
• cmake/LibraryConfig.cmake (modified) (3 diffs)
• cmake/PackageConfigOSX.cmake (modified) (4 diffs)
• cmake/tools/FindCEGUI.cmake (modified) (2 diffs)
• src/external/tolua/CMakeLists.txt (modified) (1 diff)
• src/external/tolua/tolua++.h (deleted)
• src/orxonox/worldentities/Actionpoint.cc (modified) (1 diff)

code/branches/mac_HS16/CMakeLists.txt

@@ -143 +143 @@
 
 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()
+  # Use the latest SDK and a minimum deployment target of Mountain Lion
+  SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+  SET(CMAKE_OSX_ARCHITECTURES "x86_64")
 ENDIF()
 
@@ -188 +178 @@
 ADD_SUBDIRECTORY(doc)
 
+IF(APPLE)
+        INCLUDE(CopyLibPhase)
+ENDIF(APPLE)
+
 ########### CPack Packaging ###########
 
 # Currently only testing on Apple
-#IF(APPLE)
-#  INCLUDE(BundleConfig)
-#ENDIF(APPLE)
+# IF(APPLE)
+#   INCLUDE(BundleConfig)
+# ENDIF(APPLE)

code/branches/mac_HS16/cmake/LibraryConfig.cmake

@@ -53 +53 @@
     # Let CMake automatically download and extract the dependency package on Mac OS X
     # TODO: Handle download errors and always select newest package
-    SET(_dep_package_current "OrxonoxDeps_110428_2.0_OSX.tar.bz2")
+    SET(_dep_package_current "OrxonoxDeps_110530_3.0_OSX.tar.bz2")
     SET(_dep_package_url "http://svn.orxonox.net/ogre/apple/precompiled_dependencies")
     MESSAGE(STATUS "Downloading Mac OS X dependency package.")
@@ -159 +159 @@
 ##### Boost #####
 # Expand the next statement if newer boost versions are released
+SET(Boost_USE_MULTITHREADED OFF) # on newer version -mt is dropped
 SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
-                              1.53.0)
+                          1.53.0)
 FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 # No auto linking, so this option is useless anyway
@@ -213 +214 @@
 # Note 2: Render systems are found automatically (at least one required)
 CHECK_OGRE_PLUGINS("Plugin_ParticleFX" "Plugin_CgProgramManager")
-

code/branches/mac_HS16/cmake/PackageConfigOSX.cmake

@@ -26 +26 @@
 INCLUDE(CheckPackageVersion)
 
-CHECK_PACKAGE_VERSION(2.0)
+CHECK_PACKAGE_VERSION(3.0)
 
 IF(NOT _INTERNAL_PACKAGE_MESSAGE)
   MESSAGE(STATUS "Using library package for the dependencies.")
-  
+
   # The following shell script sets the appropriate install_names for our libraries
   # and therefore it must be run before anything else is set, dep-package-wise.
@@ -38 +38 @@
       COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh
       WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR}
-      OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me 
+      OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me
     )
   ENDIF()
@@ -62 +62 @@
 SET(OGRE_NEEDS_BOOST TRUE)
 
-# For OS X 10.5 we have to ship modified headers to make it compile
-# on gcc >= 4.2 (binaries stay the same)
-# Sets the library path for the FIND_LIBRARY
-IF(CMAKE_SYSTEM_VERSION STREQUAL "10.5")
-  SET(ENV{OPENALDIR} ${DEP_INCLUDE_DIR}/openal)
-ENDIF()
-
 ### INSTALL ###
 
@@ -78 +71 @@
 #  DESTINATION lib/tcl
 #)
-
-# TODO: Install on OSX
-IF(FALSE)
-  ## DEBUG
-  # When installing a debug version, we really can't know which libraries
-  # are used in released mode because there might be deps of deps.
-  # --> Copy all of them, except the debug databases
-  INSTALL(
-    DIRECTORY ${DEP_BINARY_DIR}/
-    DESTINATION bin
-    CONFIGURATIONS Debug
-    REGEX "^.*\\.pdb$" EXCLUDE
-  )
-
-  ## RELEASE
-  # Try to filter out all the debug libraries. If the regex doesn't do the
-  # job anymore, simply adjust it.
-  INSTALL(
-    DIRECTORY ${DEP_BINARY_DIR}/
-    DESTINATION bin
-    CONFIGURATIONS RelForDevs Release RelWithDebInfo MinSizeRel
-    REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
-  )
-ENDIF()

code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake

@@ -91 +91 @@
 )
 
+MESSAGE("Looking for ceguitolua++")
+MESSAGE(${DEP_INCLUDE_DIR})
+
 # Find CEGUI Tolua++ include file
 # We only need to add this path since we use tolua++ like a normal
@@ -99 +102 @@
     # For newer CEGUI versions >= 0.7
     ${CEGUILUA_INCLUDE_DIR}/support/tolua++
-    ${DEP_INCLUDE_DIR}/tolua++/include
-    # For Mac OS X, tolua++ is a separate framework in the dependency package
-    ${DEP_FRAMEWORK_DIR}
+    ${DEP_INCLUDE_DIR}/tolua++
   NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )

code/branches/mac_HS16/src/external/tolua/CMakeLists.txt

@@ -35 +35 @@
 SET(TOLUA_PARSER_DEPENDENCIES
   toluaapp_orxonox
-  ${CMAKE_CURRENT_SOURCE_DIR}/tolua++.h
   ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua

code/branches/mac_HS16/src/orxonox/worldentities/Actionpoint.cc

@@ -31 +31 @@
 namespace orxonox
 {
-    RegisterClass(Actionpoint);
+//    RegisterClass(Actionpoint); ?
 
     Actionpoint::Actionpoint(Context* context) : StaticEntity(context)
     {
-        RegisterObject(Actionpoint);
+//        RegisterObject(Actionpoint);
         
         this->actionName_ = "";