Skip to content

Commit

Permalink
fix for BlenderPlot.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
wookay committed Jun 4, 2018
1 parent ba65f70 commit 556f687
Show file tree
Hide file tree
Showing 10 changed files with 438 additions and 16 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid d
mark_as_advanced(WITH_PYTHON_SAFETY)
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)
if(APPLE)
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" ON)
endif()

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

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

Expand Down Expand Up @@ -856,13 +856,13 @@ set(CC_REMOVE_STRICT_FLAGS)

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

# Added to linker flags in setup_liblinks
# - CMAKE_EXE_LINKER_FLAGS
# - CMAKE_EXE_LINKER_FLAGS_DEBUG
set(PLATFORM_LINKFLAGS "")
set(PLATFORM_LINKFLAGS_DEBUG "")
set(PLATFORM_LINKFLAGS "-L/usr/local/Frameworks/Python.framework/Versions/3.6/lib")
set(PLATFORM_LINKFLAGS_DEBUG "-L/usr/local/Frameworks/Python.framework/Versions/3.6/lib")

if(WITH_COMPILER_ASAN)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
Expand Down
4 changes: 2 additions & 2 deletions build_files/cmake/platform/platform_apple.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if(WITH_PYTHON)
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
else()
# module must be compiled against Python framework
set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
set(_py_framework "/usr/local/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")

set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
Expand Down Expand Up @@ -195,7 +195,7 @@ endif()

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

if(WITH_OPENCOLLADA)
Expand Down
2 changes: 1 addition & 1 deletion release/datafiles/locale
2 changes: 1 addition & 1 deletion release/scripts/addons
2 changes: 1 addition & 1 deletion release/scripts/addons_contrib
Loading

0 comments on commit 556f687

Please sign in to comment.