Page MenuHome
Differential D4501 Diff 14697 source/creator/CMakeLists.txt

Changeset View

Standalone View

View Options

source/creator/CMakeLists.txt

Show First 20 Lines • Show All 627 Lines • ▼ Show 20 Lines if(WITH_PYTHON_INSTALL)
unset(_requests_dep) unset(_requests_dep)
unset(_requests_deps) unset(_requests_deps)
unset(_suffix) unset(_suffix)
endif() endif()
unset(_target_LIB) unset(_target_LIB)
endif() endif()
endif() endif()
if(WITH_DRACO)
install(
PROGRAMS ${CMAKE_BINARY_DIR}/lib/lib${DRACO_LIB_NAME}.so
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
endif()
elseif(WIN32) elseif(WIN32)
set(BLENDER_TEXT_FILES_DESTINATION ".") set(BLENDER_TEXT_FILES_DESTINATION ".")
bartusUnsubmitted
Done
Inline Actions

undefined DRACO_LIB_NAME breaks install script at source/creator/cmake_instal.cmake

236 if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
237   file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/blender/2.80/python/lib/python3.7/site-packages" TYPE PROGRAM MESSAGE_LAZY FILES "/tmp/blender-2.8-git/src/blender-build/lib/lib.so")
238 endif()
bartus: undefined `DRACO_LIB_NAME` breaks install script at `source/creator/cmake_instal.cmake` ```…
if(WITH_PYTHON) if(WITH_PYTHON)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
if(NOT CMAKE_COMPILER_IS_GNUCC) if(NOT CMAKE_COMPILER_IS_GNUCC)
install( install(
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
DESTINATION "." DESTINATION "."
▲ Show 20 Lines • Show All 180 Lines • ▼ Show 20 Lines install(
FILES FILES
${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_gpu.cmd ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_gpu.cmd
${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd
${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_log.cmd ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_debug_log.cmd
${CMAKE_SOURCE_DIR}/release/windows/batch/blender_factory_startup.cmd ${CMAKE_SOURCE_DIR}/release/windows/batch/blender_factory_startup.cmd
DESTINATION "." DESTINATION "."
) )
if(WITH_DRACO)
install(
PROGRAMS ${CMAKE_BINARY_DIR}/lib/$<CONFIG>/${DRACO_LIB_NAME}.dll
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
)
endif()
elseif(APPLE) elseif(APPLE)
# handy install macro to exclude files, we use \$ escape for the "to" # handy install macro to exclude files, we use \$ escape for the "to"
# argument when calling so ${BUILD_TYPE} does not get expanded # argument when calling so ${BUILD_TYPE} does not get expanded
macro(install_dir from to) macro(install_dir from to)
install( install(
DIRECTORY ${from} DIRECTORY ${from}
DESTINATION ${to} DESTINATION ${to}
▲ Show 20 Lines • Show All 88 Lines • ▼ Show 20 Lines if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
get_filename_component(_py_inc_suffix ${PYTHON_INCLUDE_DIR} NAME) get_filename_component(_py_inc_suffix ${PYTHON_INCLUDE_DIR} NAME)
install( install(
FILES ${PYTHON_INCLUDE_DIR}/pyconfig.h FILES ${PYTHON_INCLUDE_DIR}/pyconfig.h
DESTINATION ${TARGETDIR_VER}/python/include/${_py_inc_suffix} DESTINATION ${TARGETDIR_VER}/python/include/${_py_inc_suffix}
) )
unset(_py_inc_suffix) unset(_py_inc_suffix)
endif() endif()
if(WITH_DRACO)
install(
PROGRAMS ${CMAKE_BINARY_DIR}/lib/lib${DRACO_LIB_NAME}.dylib
DESTINATION ${TARGETDIR_VER}/python/lib/python${PYTHON_VERSION}/site-packages
)
endif()
endif() endif()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Generic Install, for all targets # Generic Install, for all targets
if(DEFINED BLENDER_TEXT_FILES_DESTINATION) if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
install( install(
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines