diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-05-27 17:01:49 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-05-27 17:01:49 +0300 |
commit | d8aaed17eb889c7acab08c89a8efd42fb5f9716d (patch) | |
tree | 4a77d67d7623546e3cdfb5cb5be64e9e4c9d65bb /source/creator | |
parent | e6777be1d11e8f23fb54b64cf59ad7fe084ce7c8 (diff) | |
parent | 3d86a5bc72a63b1ef8b165d68a1806d0abf0a8ac (diff) |
Merge branch 'master' into object_nodes
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 66a06e8c1ab..7d0dddded84 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -409,7 +409,8 @@ if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*") # message after building. add_custom_command( TARGET blender POST_BUILD MAIN_DEPENDENCY blender - COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}' + COMMAND ${CMAKE_COMMAND} -E + echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}' ) endif() @@ -557,9 +558,6 @@ if(UNIX AND NOT APPLE) ) 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 {} '\;')") - if(WITH_PYTHON_INSTALL_NUMPY) # Install to the same directory as the source, so debian-like # distros are happy with their policy. @@ -577,7 +575,7 @@ if(UNIX AND NOT APPLE) PATTERN "oldnumeric" EXCLUDE # ./oldnumeric PATTERN "doc" EXCLUDE # ./doc PATTERN "tests" EXCLUDE # ./tests - PATTERN "f2py" EXCLUDE # ./f2py - fortran/python interface code, not fun for blender devs. + PATTERN "f2py" EXCLUDE # ./f2py - fortran/python interface code, not for blender. PATTERN "include" EXCLUDE # include dirs all over, we wont use NumPy/CAPI PATTERN "*.h" EXCLUDE # some includes are not in include dirs PATTERN "*.a" EXCLUDE # ./core/lib/libnpymath.a - for linking, we dont need. @@ -618,7 +616,7 @@ if(UNIX AND NOT APPLE) FILES ${PYTHON_REQUESTS_PATH}/six.py DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}/python${PYTHON_VERSION}/${_suffix} ) - endif() + endif() unset(_requests_dep) unset(_requests_deps) unset(_suffix) @@ -696,16 +694,26 @@ elseif(WIN32) if(WITH_PYTHON_INSTALL_NUMPY) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy - COMMAND ${CMAKE_COMMAND} -E tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz" - DEPENDS ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz + COMMAND ${CMAKE_COMMAND} -E + make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy + COMMAND ${CMAKE_COMMAND} -E + tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz" + DEPENDS + ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) - add_custom_target(python_numpy ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy - DESTINATION ${BLENDER_VERSION}/python/lib/site-packages) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages + ) + add_custom_target( + python_numpy ALL + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy + ) + install( + DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy + DESTINATION ${BLENDER_VERSION}/python/lib/site-packages + ) endif() @@ -924,7 +932,8 @@ elseif(APPLE) OUTPUT_STRIP_TRAILING_WHITESPACE) # Give the bundle actual creation/modification date - execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE} ${EXECUTABLE_OUTPUT_PATH}/blender.app) + execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE} + ${EXECUTABLE_OUTPUT_PATH}/blender.app) install( TARGETS blender @@ -1026,7 +1035,8 @@ elseif(APPLE) ) # Give the bundle actual creation/modification date - execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE} ${EXECUTABLE_OUTPUT_PATH}/blenderplayer.app) + execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE} + ${EXECUTABLE_OUTPUT_PATH}/blenderplayer.app) install( FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo @@ -1039,10 +1049,10 @@ elseif(APPLE) ) if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') - install( - FILES ${LIBDIR}/openmp/lib/libiomp5.dylib - DESTINATION blenderplayer.app/Contents/Resources/lib/ - ) + install( + FILES ${LIBDIR}/openmp/lib/libiomp5.dylib + DESTINATION blenderplayer.app/Contents/Resources/lib/ + ) endif() @@ -1113,9 +1123,11 @@ setup_liblinks(blender) # Setup launcher if(WIN32 AND NOT WITH_PYTHON_MODULE) - install(TARGETS blender - COMPONENT Blender - DESTINATION ".") + install( + TARGETS blender + COMPONENT Blender + DESTINATION "." + ) if(MSVC12_REDIST_DIR) if(CMAKE_CL_64) @@ -1124,13 +1136,16 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE) set(_WIN_PLATFORM x86) endif() install( - FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcp120.dll - ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcr120.dll - DESTINATION ".") + FILES + ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcp120.dll + ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcr120.dll + DESTINATION "." + ) if(WITH_OPENMP) install( FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.OpenMP/vcomp120.dll - DESTINATION ".") + DESTINATION "." + ) endif() endif() endif() |