Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / creator / CMakeLists.txt
index fb02a7c871c5c129562343e52d115a30cd709794..7d382b0f58199289be2c735c44faecef29dcbf47 100644 (file)
@@ -76,12 +76,6 @@ if(WITH_HEADLESS)
        add_definitions(-DWITH_HEADLESS)
 endif()
 
-if(WITH_GAMEENGINE)
-       blender_include_dirs(../gameengine/BlenderRoutines)
-
-       add_definitions(-DWITH_GAMEENGINE)
-endif()
-
 if(WITH_SDL)
        if(WITH_SDL_DYNLOAD)
                add_definitions(-DWITH_SDL_DYNLOAD)
@@ -944,53 +938,6 @@ elseif(APPLE)
                unset(_py_inc_suffix)
        endif()
 
-       # install blenderplayer bundle - copy of blender.app above. re-using macros et al
-       # note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
-       if(WITH_GAMEENGINE AND WITH_PLAYER)
-               set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app)
-               set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
-               set(PLAYER_TARGETDIR_VER blenderplayer.app/Contents/Resources/${BLENDER_VERSION})
-
-
-               # important to make a clean  install each time else old scripts get loaded.
-               install(
-                       CODE
-                       "file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
-               )
-
-               # Give the bundle actual creation/modification date
-               execute_process(COMMAND SetFile -d ${SETFILE_DATE} -m ${SETFILE_DATE}
-                               ${EXECUTABLE_OUTPUT_PATH}/blenderplayer.app)
-
-               install(
-                       FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
-                       DESTINATION blenderplayer.app/Contents
-               )
-
-               install_dir(
-                       ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
-                       blenderplayer.app/Contents/
-               )
-
-               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/
-                       )
-               endif()
-
-
-               # python
-               if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
-                       # Copy the python libs into the install directory
-                       install_dir(
-                               ${PYTHON_LIBPATH}
-                               ${PLAYER_TARGETDIR_VER}/python/lib
-                       )
-               endif()
-
-       endif()
-
 endif()
 
 # -----------------------------------------------------------------------------
@@ -1025,6 +972,34 @@ unset(BLENDER_TEXT_FILES)
 unset(BLENDER_TEXT_FILES_DESTINATION)
 
 
+# -----------------------------------------------------------------------------
+# Geometry Icons
+
+# Geometry icons.
+get_property(_icon_names GLOBAL PROPERTY ICON_GEOM_NAMES)
+set(_icon_files)
+foreach(_f ${_icon_names})
+       list(APPEND _icon_files
+               "${CMAKE_SOURCE_DIR}/release/datafiles/icons/${_f}.dat"
+       )
+endforeach()
+install(
+       FILES ${_icon_files}
+       DESTINATION ${TARGETDIR_VER}/datafiles/icons
+)
+
+unset(_icon_names)
+unset(_icon_files)
+unset(_f)
+
+# -----------------------------------------------------------------------------
+# Studio Lights
+install(
+       DIRECTORY
+               ${CMAKE_SOURCE_DIR}/release/datafiles/studiolights
+       DESTINATION ${TARGETDIR_VER}/datafiles
+)
+
 # -----------------------------------------------------------------------------
 # Setup link libs