diff options
author | Matt Ebb <matt@mke3.net> | 2009-03-04 11:58:24 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-03-04 11:58:24 +0300 |
commit | 7d5ef14d5fa7301778ae9f0d80b68a04107e4ef2 (patch) | |
tree | 81f6bab2f73ff441f4078bab3f10fae2ec7430e4 | |
parent | 0f040e2f267dcec976bb088d653a56d4c6ed28ad (diff) |
Some compiling tweaks for cmake / osx 10.5
-rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be2c9b6b950..2d70716a468 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,22 +348,28 @@ IF(APPLE) SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc) ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) - INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) - IF(OPENAL_FOUND) - SET(WITH_OPENAL ON) - SET(OPENAL_LIB ${OPENAL_LIBRARY}) - SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) - ELSE(OPENAL_FOUND) - SET(WITH_OPENAL OFF) - ENDIF(OPENAL_FOUND) + IF(WITH_OPENAL) + INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) + IF(OPENAL_FOUND) + SET(WITH_OPENAL ON) + SET(OPENAL_LIB ${OPENAL_LIBRARY}) + SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) + ELSE(OPENAL_FOUND) + SET(WITH_OPENAL OFF) + ENDIF(OPENAL_FOUND) + ENDIF(WITH_OPENAL) SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/) - SET(PYTHON_VERSION 2.3) + SET(PYTHON_VERSION 2.5) SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "") SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") SET(PYTHON_LIB "") SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "") - SET(PYTHON_LINKFLAGS "-u __dummy -u _PyMac_Error -framework System -framework Python") + IF(CMAKE_SYSTEM_VERSION GREATER 10.4) + SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python") + ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4) + SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python") + ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4) SET(GETTEXT ${LIBDIR}/gettext) SET(GETTEXT_INC "${GETTEXT}/include") |