Changeset 11278 for code/branches/mac_HS16/cmake
- Timestamp:
- Nov 8, 2016, 9:05:10 AM (8 years ago)
- Location:
- code/branches/mac_HS16/cmake
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mac_HS16/cmake/LibraryConfig.cmake
r11113 r11278 53 53 # Let CMake automatically download and extract the dependency package on Mac OS X 54 54 # TODO: Handle download errors and always select newest package 55 SET(_dep_package_current "OrxonoxDeps_110 428_2.0_OSX.tar.bz2")55 SET(_dep_package_current "OrxonoxDeps_110530_3.0_OSX.tar.bz2") 56 56 SET(_dep_package_url "http://svn.orxonox.net/ogre/apple/precompiled_dependencies") 57 57 MESSAGE(STATUS "Downloading Mac OS X dependency package.") … … 159 159 ##### Boost ##### 160 160 # Expand the next statement if newer boost versions are released 161 SET(Boost_USE_MULTITHREADED OFF) # on newer version -mt is dropped 161 162 SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0 162 163 1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0 163 164 1.53.0) 164 165 FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time) 165 166 # No auto linking, so this option is useless anyway … … 213 214 # Note 2: Render systems are found automatically (at least one required) 214 215 CHECK_OGRE_PLUGINS("Plugin_ParticleFX" "Plugin_CgProgramManager") 215 -
code/branches/mac_HS16/cmake/PackageConfigOSX.cmake
r8368 r11278 26 26 INCLUDE(CheckPackageVersion) 27 27 28 CHECK_PACKAGE_VERSION( 2.0)28 CHECK_PACKAGE_VERSION(3.0) 29 29 30 30 IF(NOT _INTERNAL_PACKAGE_MESSAGE) 31 31 MESSAGE(STATUS "Using library package for the dependencies.") 32 32 33 33 # The following shell script sets the appropriate install_names for our libraries 34 34 # and therefore it must be run before anything else is set, dep-package-wise. … … 38 38 COMMAND ${DEPENDENCY_PACKAGE_DIR}/install_dependencies.sh 39 39 WORKING_DIRECTORY ${DEPENDENCY_PACKAGE_DIR} 40 OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me 40 OUTPUT_FILE ${CMAKE_BINARY_DIR}/dep_pack_install_log.keep_me 41 41 ) 42 42 ENDIF() … … 62 62 SET(OGRE_NEEDS_BOOST TRUE) 63 63 64 # For OS X 10.5 we have to ship modified headers to make it compile65 # on gcc >= 4.2 (binaries stay the same)66 # Sets the library path for the FIND_LIBRARY67 IF(CMAKE_SYSTEM_VERSION STREQUAL "10.5")68 SET(ENV{OPENALDIR} ${DEP_INCLUDE_DIR}/openal)69 ENDIF()70 71 64 ### INSTALL ### 72 65 … … 78 71 # DESTINATION lib/tcl 79 72 #) 80 81 # TODO: Install on OSX82 IF(FALSE)83 ## DEBUG84 # When installing a debug version, we really can't know which libraries85 # are used in released mode because there might be deps of deps.86 # --> Copy all of them, except the debug databases87 INSTALL(88 DIRECTORY ${DEP_BINARY_DIR}/89 DESTINATION bin90 CONFIGURATIONS Debug91 REGEX "^.*\\.pdb$" EXCLUDE92 )93 94 ## RELEASE95 # Try to filter out all the debug libraries. If the regex doesn't do the96 # job anymore, simply adjust it.97 INSTALL(98 DIRECTORY ${DEP_BINARY_DIR}/99 DESTINATION bin100 CONFIGURATIONS RelForDevs Release RelWithDebInfo MinSizeRel101 REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE102 )103 ENDIF() -
code/branches/mac_HS16/cmake/tools/FindCEGUI.cmake
r11117 r11278 91 91 ) 92 92 93 MESSAGE("Looking for ceguitolua++") 94 MESSAGE(${DEP_INCLUDE_DIR}) 95 93 96 # Find CEGUI Tolua++ include file 94 97 # We only need to add this path since we use tolua++ like a normal … … 99 102 # For newer CEGUI versions >= 0.7 100 103 ${CEGUILUA_INCLUDE_DIR}/support/tolua++ 101 ${DEP_INCLUDE_DIR}/tolua++/include 102 # For Mac OS X, tolua++ is a separate framework in the dependency package 103 ${DEP_FRAMEWORK_DIR} 104 ${DEP_INCLUDE_DIR}/tolua++ 104 105 NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system 105 106 )
Note: See TracChangeset
for help on using the changeset viewer.