blender/blender
166
522
Fork 797
Code Issues 6.8k Pull Requests 949 Projects 21 Wiki Activity

build draco lib when building blender as a python module #125556

Manually merged
Campbell Barton merged 1 commits from BuildXYZ/blender:build-draco-for-python-module into main 2024-09-06 13:18:44 +02:00
Conversation 8 Commits 1 Files Changed 3 +33 -20
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 67355fe07d - Show all commits

5
CMakeLists.txt
View File

@ -1197,11 +1197,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF)
if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
set(WITH_DRACO OFF)
endif()
# enable boost for cycles, audaspace or i18n
# otherwise if the user disabled

3
build_files/cmake/config/bpy_module.cmake
View File

@ -29,9 +29,6 @@ set(WITH_PYTHON_MODULE ON CACHE BOOL "" FORCE)
# There is no point in copying python into Python.
set(WITH_PYTHON_INSTALL OFF CACHE BOOL "" FORCE)
# Depends on Python install, do this to quiet warning.
set(WITH_DRACO OFF CACHE BOOL "" FORCE)
if(WIN32)
set(WITH_WINDOWS_BUNDLE_CRT OFF CACHE BOOL "" FORCE)
endif()

45
source/creator/CMakeLists.txt
View File

@ -964,10 +964,17 @@ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
endif()
if(WITH_DRACO)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
if(WITH_PYTHON_MODULE)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${CMAKE_BINARY_DIR}/bin/bpy/lib
)
else()
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
endif()
endif()
elseif(WIN32)
if(WITH_WINDOWS_EXTERNAL_MANIFEST)
@ -1491,10 +1498,17 @@ elseif(WIN32)
endif()
if(WITH_DRACO)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
)
if(WITH_PYTHON_MODULE)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${CMAKE_BINARY_DIR}/bin/bpy/lib
)
else()
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
endif()
endif()
if(WITH_PYTHON_MODULE AND TARGETDIR_BPY)
@ -1614,10 +1628,17 @@ elseif(APPLE)
endif()
if(WITH_DRACO)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
if(WITH_PYTHON_MODULE)
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${CMAKE_BINARY_DIR}/bin/bpy/lib
)
else()
install(
PROGRAMS $<TARGET_FILE:extern_draco>
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
endif()
endif()
endif()