Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/creator/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt114
1 files changed, 76 insertions, 38 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a3589175197..273e5b33d0d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -49,7 +49,7 @@ if(WIN32)
endif()
if(WITH_LIBMV)
- blender_include_dirs(../../extern/libmv)
+ blender_include_dirs(../../intern/libmv)
add_definitions(-DWITH_LIBMV)
endif()
@@ -102,6 +102,10 @@ endif()
# Setup the exe sources and buildinfo
set(SRC
creator.c
+ creator_args.c
+ creator_signals.c
+
+ creator_intern.h
)
# MSVC 2010 gives linking errors with the manifest
@@ -130,7 +134,7 @@ if(WIN32 AND NOT UNIX)
list(APPEND SRC
- ../icons/winblender.rc
+ ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc
)
endif()
@@ -250,8 +254,11 @@ endif()
set(BLENDER_TEXT_FILES
${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
+ ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt
${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
${CMAKE_SOURCE_DIR}/release/text/copyright.txt
+ ${CMAKE_SOURCE_DIR}/release/text/jemalloc-license.txt
+ ${CMAKE_SOURCE_DIR}/release/text/ocio-license.txt
# generate this file
# ${CMAKE_SOURCE_DIR}/release/text/readme.html
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
@@ -292,7 +299,8 @@ elseif(APPLE)
else()
set(TARGETDIR_VER blender.app/Contents/Resources/${BLENDER_VERSION})
endif()
-
+ # Skip relinking on cpack / install
+ set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true)
endif()
@@ -503,7 +511,7 @@ if(UNIX AND NOT APPLE)
if(WITH_PYTHON_INSTALL)
install(
- FILES ${PYTHON_EXECUTABLE}
+ PROGRAMS ${PYTHON_EXECUTABLE}
DESTINATION ${TARGETDIR_VER}/python/bin
)
@@ -521,17 +529,12 @@ if(UNIX AND NOT APPLE)
unset(_pypath_real)
# Copy the systems python into the install directory
- # Scons copy in tools/Blender.py
# install(CODE "message(\"copying a subset of the systems python...\")")
install(
DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
- PATTERN ".svn" EXCLUDE
PATTERN "__pycache__" EXCLUDE # * any cache *
- PATTERN "distutils" EXCLUDE # ./distutils
PATTERN "lib2to3" EXCLUDE # ./lib2to3
- PATTERN "config" EXCLUDE # ./config
- PATTERN "config-*" EXCLUDE # ./config-*
PATTERN "site-packages/*" EXCLUDE # ./site-packages/*
PATTERN "tkinter" EXCLUDE # ./tkinter
PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co
@@ -541,6 +544,15 @@ if(UNIX AND NOT APPLE)
PATTERN "turtle.py" EXCLUDE # ./turtle.py
)
+ # Needed for distutils/pip
+ # get the last part of the include dir, will be 'python{version}{abiflag}',
+ get_filename_component(_py_inc_suffix ${PYTHON_INCLUDE_DIR} NAME)
+ install(
+ FILES ${PYTHON_INCLUDE_DIR}/pyconfig.h
+ DESTINATION ${TARGETDIR_VER}/python/include/${_py_inc_suffix}
+ )
+ unset(_py_inc_suffix)
+
# # doesnt work, todo
# install(CODE "execute_process(COMMAND find ${CMAKE_INSTALL_PREFIX}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
@@ -558,7 +570,6 @@ if(UNIX AND NOT APPLE)
PATTERN "__pycache__" EXCLUDE # * any cache *
PATTERN "*.pyc" EXCLUDE # * any cache *
PATTERN "*.pyo" EXCLUDE # * any cache *
- PATTERN "distutils" EXCLUDE # ./distutils
PATTERN "oldnumeric" EXCLUDE # ./oldnumeric
PATTERN "doc" EXCLUDE # ./doc
PATTERN "tests" EXCLUDE # ./tests
@@ -583,7 +594,6 @@ if(UNIX AND NOT APPLE)
PATTERN "__pycache__" EXCLUDE # * any cache *
PATTERN "*.pyc" EXCLUDE # * any cache *
PATTERN "*.pyo" EXCLUDE # * any cache *
- PATTERN "cacert.pem" EXCLUDE # for now we don't deal with security
)
# On some platforms requests does have extra dependencies.
set(_requests_deps "chardet" "urllib3")
@@ -620,17 +630,20 @@ elseif(WIN32)
if(WITH_PYTHON)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
- install(
- FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll ${LIBDIR}/python/lib/sqlite3.dll
- DESTINATION "."
- CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
- )
+ # MinGW TODO: This bit of Python configuration diverges from MSVC
+ if(NOT CMAKE_COMPILER_IS_GNUCC)
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
+ DESTINATION "."
+ CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+ )
- install(
- FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll ${LIBDIR}/python/lib/sqlite3_d.dll
- DESTINATION "."
- CONFIGURATIONS Debug
- )
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
+ DESTINATION "."
+ CONFIGURATIONS Debug
+ )
+ endif()
if(WITH_PYTHON_INSTALL)
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
@@ -703,6 +716,20 @@ elseif(WIN32)
DESTINATION ${BLENDER_VERSION}/python/bin
CONFIGURATIONS Debug
)
+
+ # MinGW needs Python DLL
+ if(MINGW)
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
+ DESTINATION "."
+ CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+ )
+ install(
+ FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
+ DESTINATION "."
+ CONFIGURATIONS Debug
+ )
+ endif()
endif()
unset(_PYTHON_VERSION_NO_DOTS)
@@ -790,13 +817,30 @@ elseif(WIN32)
${LIBDIR}/openal/lib/OpenAL32.dll
DESTINATION "."
)
+ # MinGW TODO: Need to update to a newer OpenAL version
+ # which does not depend on wrap_oal.dll
+ if(CMAKE_COMPILER_IS_GNUCC)
+ install(
+ FILES
+ ${LIBDIR}/openal/lib/wrap_oal.dll
+ DESTINATION "."
+ )
+ endif()
endif()
if(WITH_SDL)
- install(
- FILES ${LIBDIR}/sdl/lib/SDL2.dll
- DESTINATION "."
- )
+ #MinGW TODO: Update to SDL2
+ if(NOT CMAKE_COMPILER_IS_GNUCC)
+ install(
+ FILES ${LIBDIR}/sdl/lib/SDL2.dll
+ DESTINATION "."
+ )
+ else()
+ install(
+ FILES ${LIBDIR}/sdl/lib/SDL.dll
+ DESTINATION "."
+ )
+ endif()
endif()
if(WITH_SYSTEM_AUDASPACE)
@@ -945,9 +989,13 @@ elseif(APPLE)
# copy site-packages files
install_dir(
${LIBDIR}/release/site-packages
- ${CMAKE_CURRENT_BINARY_DIR}/python/lib/python${PYTHON_VERSION}/site-packages
+ ${CMAKE_CURRENT_BINARY_DIR}/python/lib/python${PYTHON_VERSION}
)
+ install(DIRECTORY ${LIBDIR}/python/bin
+ DESTINATION ${TARGETDIR_VER}/python
+ USE_SOURCE_PERMISSIONS
+ )
endif()
# install blenderplayer bundle - copy of blender.app above. re-using macros et al
@@ -1016,7 +1064,7 @@ if(DEFINED BLENDER_TEXT_FILES_DESTINATION)
"
file(READ \"${CMAKE_SOURCE_DIR}/release/text/readme.html\" DATA_SRC)
string(REGEX REPLACE \"BLENDER_VERSION\" \"${BLENDER_VERSION}\" DATA_DST \"\${DATA_SRC}\")
- file(WRITE \"\${CMAKE_BINARY_DIR}/release/text/readme.html\" \"\${DATA_DST}\")
+ file(WRITE \"${CMAKE_BINARY_DIR}/release/text/readme.html\" \"\${DATA_DST}\")
unset(DATA_SRC)
unset(DATA_DST)
"
@@ -1052,17 +1100,7 @@ setup_liblinks(blender)
# Setup launcher
if(WIN32 AND NOT WITH_PYTHON_MODULE)
- set(LAUNCHER_SRC
- creator_launch_win.c
- ../icons/winblender.rc
- )
- add_executable(blender-launcher ${LAUNCHER_SRC})
- target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS})
-
- set_target_properties(blender PROPERTIES OUTPUT_NAME blender-app)
- set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender)
-
- install(TARGETS blender blender-launcher
+ install(TARGETS blender
COMPONENT Blender
DESTINATION ".")
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 19:29:51 +0300