diff options
| author | Matt Ebb <matt@mke3.net> | 2009-07-22 16:43:37 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-07-22 16:43:37 +0400 |
| commit | 8b5fbbec8001bfe9cb66adfd7ecd6e49818e6586 (patch) | |
| tree | d4a0196d544d4a74fe3d7245352173f684767246 /CMakeLists.txt | |
| parent | 702307c8f83b6c0dba353fc02e4c96a6f574ad66 (diff) | |
* Updated CMake files to build with Python 3.1 on OS X by default. Remember to update /lib to get the precompiled libraries!
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47daa1e4b9e..b6b0ea2e5e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,17 +339,29 @@ IF(APPLE) ENDIF(OPENAL_FOUND) ENDIF(WITH_OPENAL) - SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/) - 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 "") - 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_VERSION 3.1) + + IF(PYTHON_VERSION MATCHES 3.1) + # we use precompiled libraries for py 3.1 and up by default + + SET(PYTHON ${LIBDIR}/python) + SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "") + SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") + SET(PYTHON_LIB python${PYTHON_VERSION}) + SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "") + SET(PYTHON_LINKFLAGS "-u _PyMac_Error") + ELSE(PYTHON_VERSION MATCHES 3.1) + # otherwise, use custom system framework + + SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/) + 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 _PyMac_Error -framework System -framework Python") - ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4) + ENDIF(PYTHON_VERSION MATCHES 3.1) SET(GETTEXT ${LIBDIR}/gettext) SET(GETTEXT_INC "${GETTEXT}/include") |