Changeset 11278 for code/branches/mac_HS16/cmake/PackageConfigOSX.cmake

Timestamp:

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

Author:

ahedges

Message:

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

File:

• code/branches/mac_HS16/cmake/PackageConfigOSX.cmake (modified) (4 diffs)

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()