=bmesh= merge from trunk at r36529
[blender.git] / source / creator / CMakeLists.txt
index 1dd3f8a725a979fec8747149fab96862e4c7ddec..9b2abeac1280d8f12cae38f00073c3ddeb08fbd2 100644 (file)
@@ -76,13 +76,14 @@ endif()
 if(WITH_PYTHON)
        blender_include_dirs(../blender/python)
        add_definitions(-DWITH_PYTHON)
+
+       if(WITH_PYTHON_SECURITY)
+               add_definitions(-DWITH_PYTHON_SECURITY)
+       endif()
 endif()
 
 if(WITH_GAMEENGINE)
-       blender_include_dirs(
-               ../kernel/gen_messaging
-               ../kernel/gen_system
-       )
+       blender_include_dirs(../gameengine/BlenderRoutines)
 
        add_definitions(-DWITH_GAMEENGINE)
 endif()
@@ -218,7 +219,7 @@ endif()
 # Post build steps for bundling/packaging.
 
 
-if(MSVC)
+if(MSVC_IDE)
        # ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
        set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
 elseif(APPLE)
@@ -252,7 +253,7 @@ if(UNIX AND NOT APPLE)
                install(
                        FILES
                        ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-                       ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
+                       ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
                        ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
                        DESTINATION ${TARGETDIR}
                )
@@ -289,8 +290,20 @@ if(UNIX AND NOT APPLE)
                        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
                )
                install(
-                       FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
-                       DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
+                       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/
+                       PATTERN ".svn" EXCLUDE
+                       PATTERN "*.svg" EXCLUDE
+               )
+               install(
+                       FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
+                       DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
                )
                install(
                        PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
@@ -765,7 +778,6 @@ endif()
                bf_collada
                bf_intern_bsp
                bf_intern_bop
-               bf_gen_system
                bf_intern_decimate
                bf_intern_elbeem
                bf_intern_ik
@@ -787,7 +799,6 @@ endif()
                ge_logic_expressions
                ge_scenegraph
                ge_logic_network
-               bf_gen_system
                bf_python # duplicate for BPY_driver_exec
                ge_logic_ngnetwork
                extern_bullet
@@ -802,6 +813,10 @@ endif()
                bf_intern_audaspace
                bf_intern_mikktspace
        )
+    if(WITH_MOD_CLOTH_ELTOPO)
+               list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
+    endif()
+
     if(WITH_BUILTIN_GLEW)
                list(APPEND BLENDER_SORTED_LIBS extern_glew)
     endif()