diff options
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r-- | source/creator/CMakeLists.txt | 193 |
1 files changed, 96 insertions, 97 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 965da37df9b..4fcb8a66d5c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -82,6 +82,10 @@ if(WITH_PYTHON) endif() endif() +if(WITH_HEADLESS) + add_definitions(-DWITH_HEADLESS) +endif() + if(WITH_GAMEENGINE) blender_include_dirs(../gameengine/BlenderRoutines) @@ -192,10 +196,10 @@ if(WITH_PYTHON_MODULE) set_target_properties( blender PROPERTIES - PREFIX "" - OUTPUT_NAME bpy - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ # only needed on windows + PREFIX "" + OUTPUT_NAME bpy + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin # only needed on windows ) if(WIN32) @@ -234,7 +238,11 @@ if(UNIX AND NOT APPLE) if(WITH_INSTALL_PORTABLE) set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION}) else() - set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) + if(WITH_PYTHON_MODULE) + set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION}) + else() + set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}) + endif() endif() # important to make a clean install each time @@ -254,9 +262,9 @@ if(UNIX AND NOT APPLE) if(WITH_INSTALL_PORTABLE) install( FILES - ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg - ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1 + ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg + ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1 DESTINATION ${TARGETDIR} ) @@ -267,17 +275,26 @@ if(UNIX AND NOT APPLE) ) install( - DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ + DIRECTORY ${CMAKE_SOURCE_DIR}/release/text DESTINATION ${TARGETDIR} PATTERN ".svn" EXCLUDE ) else() # main blender binary - install( - PROGRAMS ${TARGETDIR}/blender - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - ) + if(WITH_PYTHON_MODULE) + install( + TARGETS blender + LIBRARY + DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages + ) + else() + install( + PROGRAMS ${TARGETDIR}/blender + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + ) + endif() + if(WITH_GAMEENGINE AND WITH_PLAYER) install( @@ -293,13 +310,13 @@ if(UNIX AND NOT APPLE) ) install( DIRECTORY - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16 - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22 - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24 - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32 - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48 - ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256 - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/ + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16 + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22 + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24 + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32 + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48 + ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256 + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor PATTERN ".svn" EXCLUDE PATTERN "*.svg" EXCLUDE ) @@ -316,7 +333,7 @@ if(UNIX AND NOT APPLE) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 ) install( - DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ + DIRECTORY ${CMAKE_SOURCE_DIR}/release/text DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender PATTERN ".svn" EXCLUDE ) @@ -335,7 +352,7 @@ if(UNIX AND NOT APPLE) install( DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - DESTINATION ${TARGETDIR_VER}/datafiles/ + DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) endif() @@ -344,7 +361,7 @@ if(UNIX AND NOT APPLE) # # install( # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - # DESTINATION ${TARGETDIR_VER}/ + # DESTINATION ${TARGETDIR_VER} # PATTERN ".svn" EXCLUDE # ) @@ -352,7 +369,7 @@ if(UNIX AND NOT APPLE) # install(CODE "message(\"copying blender scripts...\")") install( DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts - DESTINATION ${TARGETDIR_VER}/ + DESTINATION ${TARGETDIR_VER} PATTERN ".svn" EXCLUDE PATTERN "__pycache__" EXCLUDE ) @@ -363,9 +380,9 @@ if(UNIX AND NOT APPLE) # install(CODE "message(\"copying a subset of the systems python...\")") install( DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION} - DESTINATION ${TARGETDIR_VER}/python/lib/ + DESTINATION ${TARGETDIR_VER}/python/lib PATTERN ".svn" EXCLUDE - PATTERN "__pycache__" EXCLUDE # ./distutils + PATTERN "__pycache__" EXCLUDE # * any cache * PATTERN "distutils" EXCLUDE # ./distutils PATTERN "lib2to3" EXCLUDE # ./lib2to3 PATTERN "config" EXCLUDE # ./config @@ -373,8 +390,10 @@ if(UNIX AND NOT APPLE) PATTERN "site-packages/*" EXCLUDE # ./site-packages/* PATTERN "tkinter" EXCLUDE # ./tkinter PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co + PATTERN "idlelib" EXCLUDE # ./idlelib PATTERN "test" EXCLUDE # ./test PATTERN "turtledemo" EXCLUDE # ./turtledemo + PATTERN "turtle.py" EXCLUDE # ./turtle.py ) # # doesnt work, todo @@ -391,8 +410,8 @@ elseif(WIN32) ) install( # same as linux!, deduplicate - DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ - DESTINATION ${TARGETDIR}/ + DIRECTORY ${CMAKE_SOURCE_DIR}/release/text + DESTINATION ${TARGETDIR} PATTERN ".svn" EXCLUDE ) @@ -408,25 +427,25 @@ elseif(WIN32) ) install( DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - DESTINATION ${TARGETDIR_VER}/datafiles/ + DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) if(NOT CMAKE_CL_64) install( FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} ) install( FILES ${LIBDIR}/iconv/lib/iconv.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} ) endif() endif() install( # same as linux!, deduplicate - DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/ + DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale DESTINATION ${TARGETDIR_VER}/datafiles/locale PATTERN ".svn" EXCLUDE ) @@ -435,7 +454,7 @@ elseif(WIN32) # # install( # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins - # DESTINATION ${TARGETDIR_VER}/ + # DESTINATION ${TARGETDIR_VER} # PATTERN ".svn" EXCLUDE # ) @@ -443,64 +462,48 @@ elseif(WIN32) # install(CODE "message(\"copying blender scripts...\")") install( # same as linux!, deduplicate DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts - DESTINATION ${TARGETDIR_VER}/ + DESTINATION ${TARGETDIR_VER} PATTERN ".svn" EXCLUDE PATTERN "__pycache__" EXCLUDE ) - # TODO, multiple targets? - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS Release) - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS RelWithDebInfo) - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS MinSizeRel) + install( + FILES ${LIBDIR}/python/lib/python32.dll + DESTINATION ${TARGETDIR} + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + ) install( FILES ${LIBDIR}/python/lib/python32_d.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} CONFIGURATIONS Debug ) if(WITH_PYTHON_INSTALL) - #~ # note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags. + # note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags. # create the directory in multiple steps, so it actually gets created when it doesn't exist yet - install(CODE " - message(\"creating ${TARGETDIR_VER}/python/lib\") - file(MAKE_DIRECTORY ${TARGETDIR_VER}/python/) - file(MAKE_DIRECTORY ${TARGETDIR_VER}/python/lib/) - message(\"done creating dir\") - ") - install( CODE " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") + message(\"creating ${TARGETDIR_VER}/python/lib\") + file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\") + file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\") + message(\"done creating dir\") " - CONFIGURATIONS Release - ) - install( - CODE - " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") - " - CONFIGURATIONS RelWithDebInfo - ) - install( - CODE - " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") - " - CONFIGURATIONS MinSizeRel ) + install( CODE " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\") + if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\") + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" + \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\") + else() + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" + \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") + endif() " - CONFIGURATIONS Debug ) # doesnt work, todo @@ -512,80 +515,76 @@ elseif(WIN32) # gettext and png are statically linked on win64 install( FILES ${LIBDIR}/zlib/lib/zlib.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} ) else() install( FILES - ${LIBDIR}/png/lib/libpng.dll - ${LIBDIR}/zlib/lib/zlib.dll - DESTINATION ${TARGETDIR}/ + ${LIBDIR}/png/lib/libpng.dll + ${LIBDIR}/zlib/lib/zlib.dll + DESTINATION ${TARGETDIR} ) endif() if(MSVC) install( FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} ) else() install( FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll - DESTINATION ${TARGETDIR}/ + DESTINATION ${TARGETDIR} ) endif() if(WITH_CODEC_FFMPEG) install( FILES - ${LIBDIR}/ffmpeg/lib/avcodec-52.dll - ${LIBDIR}/ffmpeg/lib/avformat-52.dll - ${LIBDIR}/ffmpeg/lib/avdevice-52.dll - ${LIBDIR}/ffmpeg/lib/avutil-50.dll - ${LIBDIR}/ffmpeg/lib/swscale-0.dll - DESTINATION ${TARGETDIR}/ + ${LIBDIR}/ffmpeg/lib/avcodec-52.dll + ${LIBDIR}/ffmpeg/lib/avformat-52.dll + ${LIBDIR}/ffmpeg/lib/avdevice-52.dll + ${LIBDIR}/ffmpeg/lib/avutil-50.dll + ${LIBDIR}/ffmpeg/lib/swscale-0.dll + DESTINATION ${TARGETDIR} ) endif() if(WITH_CODEC_SNDFILE) install( - FILES - ${LIBDIR}/sndfile/lib/libsndfile-1.dll - DESTINATION ${TARGETDIR}/ + FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll + DESTINATION ${TARGETDIR} ) endif() if(WITH_OPENAL) install( FILES - ${LIBDIR}/openal/lib/OpenAL32.dll - ${LIBDIR}/openal/lib/wrap_oal.dll - DESTINATION ${TARGETDIR}/ + ${LIBDIR}/openal/lib/OpenAL32.dll + ${LIBDIR}/openal/lib/wrap_oal.dll + DESTINATION ${TARGETDIR} ) endif() if(WITH_SDL) if(NOT CMAKE_CL_64) install( - FILES - ${LIBDIR}/sdl/lib/SDL.dll - DESTINATION ${TARGETDIR}/ + FILES ${LIBDIR}/sdl/lib/SDL.dll + DESTINATION ${TARGETDIR} ) endif() endif() if(NOT CMAKE_CL_64) install( - FILES - ${LIBDIR}/thumbhandler/lib/BlendThumb.dll - DESTINATION ${TARGETDIR}/ + FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll + DESTINATION ${TARGETDIR} ) else() install( - FILES - ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll - DESTINATION ${TARGETDIR}/ + FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll + DESTINATION ${TARGETDIR} ) endif() @@ -639,7 +638,7 @@ elseif(APPLE) install( FILES ${SOURCEDIR}/Contents/PkgInfo - DESTINATION ${TARGETDIR}/blender.app/Contents/ + DESTINATION ${TARGETDIR}/blender.app/Contents ) install_dir( |