diff options
| author | Kent Mein <mein@cs.umn.edu> | 2011-08-02 21:35:07 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2011-08-02 21:35:07 +0400 |
| commit | b2959e55f543c5979e7f03f77aec6fe342c6559f (patch) | |
| tree | fb47c1b90e166258c2c18091e60015a08efac531 /CMakeLists.txt | |
| parent | 9026dc6ee4b16f9a9db73eee09f2f397012268d2 (diff) | |
Fixes an issue with OSX Lion
Also cleaned up the python detection for OSX
Kent
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d95cbb6e536..2d104ebfcea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -910,28 +910,15 @@ elseif(APPLE) endif() if(WITH_PYTHON) - set(PYTHON_VERSION 3.2) - if(PYTHON_VERSION MATCHES 3.2) - # we use precompiled libraries for py 3.2 and up by default + # we use precompiled libraries for py 3.2 and up by default - # normally cached but not since we include them with blender - set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") - # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet - set(PYTHON_LIBRARY python${PYTHON_VERSION}) - set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") - # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled - else() - # otherwise, use custom system framework - # *not used but maintained incase some dev wants to* - - set(PYTHON "/System/Library/Frameworks/Python.framework/Versions/" CACHE PATH) - set(PYTHON_INCLUDE_DIR "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE PATH) - # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet - set(PYTHON_LIBRARY "" CACHE FILEPATH) - set(PYTHON_LIBPATH "${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config" CACHE PATH) - set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python" CACHE STRING) - unset(PYTHON) - endif() + # normally cached but not since we include them with blender + set(PYTHON_VERSION 3.2) + set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") + # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet + set(PYTHON_LIBRARY python${PYTHON_VERSION}) + set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") + # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled # uncached vars set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") @@ -986,7 +973,17 @@ elseif(APPLE) set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib) endif() - set(PLATFORM_LINKLIBS stdc++ SystemStubs) + find_library(SYSTEMSTUBS_LIBRARY + NAMES + SystemStubs + PATHS + ) + mark_as_advanced(SYSTEMSTUBS_LIBRARY) + if(SYSTEMSTUBS_LIBRARY) + set(PLATFORM_LINKLIBS stdc++ SystemStubs) + else() + set(PLATFORM_LINKLIBS stdc++) + endif() if(WITH_COCOA) set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA") |