Skip to content

Commit 556f687

Browse files
committed
fix for BlenderPlot.jl
1 parent ba65f70 commit 556f687

File tree

10 files changed

+438
-16
lines changed

10 files changed

+438
-16
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid d
205205
mark_as_advanced(WITH_PYTHON_SAFETY)
206206
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development), installs to PYTHON_SITE_PACKAGES (or CMAKE_INSTALL_PREFIX if WITH_INSTALL_PORTABLE is enabled)." OFF)
207207
if(APPLE)
208-
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
208+
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" ON)
209209
endif()
210210

211211
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ${_init_BUILDINFO})
@@ -378,9 +378,9 @@ if(UNIX AND NOT APPLE)
378378
endif()
379379
endif()
380380

381-
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
381+
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" OFF)
382382
if(WITH_PYTHON_INSTALL)
383-
option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
383+
option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" OFF)
384384
set(PYTHON_NUMPY_PATH "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
385385
mark_as_advanced(PYTHON_NUMPY_PATH)
386386

@@ -856,13 +856,13 @@ set(CC_REMOVE_STRICT_FLAGS)
856856

857857
# libraries to link the binary with passed to target_link_libraries()
858858
# known as LLIBS to scons
859-
set(PLATFORM_LINKLIBS "")
859+
set(PLATFORM_LINKLIBS "-L/usr/local/Frameworks/Python.framework/Versions/3.6/lib")
860860

861861
# Added to linker flags in setup_liblinks
862862
# - CMAKE_EXE_LINKER_FLAGS
863863
# - CMAKE_EXE_LINKER_FLAGS_DEBUG
864-
set(PLATFORM_LINKFLAGS "")
865-
set(PLATFORM_LINKFLAGS_DEBUG "")
864+
set(PLATFORM_LINKFLAGS "-L/usr/local/Frameworks/Python.framework/Versions/3.6/lib")
865+
set(PLATFORM_LINKFLAGS_DEBUG "-L/usr/local/Frameworks/Python.framework/Versions/3.6/lib")
866866

867867
if(WITH_COMPILER_ASAN)
868868
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")

build_files/cmake/platform/platform_apple.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if(WITH_PYTHON)
9797
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
9898
else()
9999
# module must be compiled against Python framework
100-
set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
100+
set(_py_framework "/usr/local/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
101101

102102
set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
103103
set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
@@ -195,7 +195,7 @@ endif()
195195

196196
if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
197197
# force cmake to link right framework
198-
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
198+
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /usr/local/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
199199
endif()
200200

201201
if(WITH_OPENCOLLADA)

release/datafiles/locale

release/scripts/addons

0 commit comments

Comments
 (0)