Revision: 38945
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38945
Author: sirdude
Date: 2011-08-02 17:35:07 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Fixes an issue with OSX Lion
Also cleaned up the python detection for OSX
Kent
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-08-02 17:32:19 UTC (rev 38944)
+++ trunk/blender/CMakeLists.txt 2011-08-02 17:35:07 UTC (rev 38945)
@@ -910,29 +910,16 @@
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*
+ # 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
- 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()
-
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
@@ -986,7 +973,17 @@
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")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
