svn merge -r40166:40279 ^/trunk/blender
[blender.git] / source / creator / CMakeLists.txt
index da08547e80323c5d73c7b31f3678305edb4cddbf..22fe0a1a1d1f2ab465675dba64a54caf71315518 100644 (file)
@@ -25,9 +25,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-# So BUILDINFO and BLENDERPATH strings are automatically quoted
-cmake_policy(SET CMP0005 NEW)
-
 setup_libdirs()
 
 blender_include_dirs(
@@ -136,6 +133,7 @@ if(WIN32 AND NOT UNIX)
 endif()
 
 if(WITH_BUILDINFO)
+       add_definitions(-DWITH_BUILDINFO)
        # --------------------------------------------------------------------------
        # These defines could all be moved into the header below
        string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
@@ -437,12 +435,12 @@ elseif(WIN32)
                        PATTERN ".svn" EXCLUDE
                )
 
-               if(NOT CMAKE_CL_64)
-                       install(
-                               FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-                               DESTINATION ${TARGETDIR}
-                       )
+               install(
+                       FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
+                       DESTINATION ${TARGETDIR}
+               )
 
+               if(NOT CMAKE_CL_64)
                        install(
                                FILES ${LIBDIR}/iconv/lib/iconv.dll
                                DESTINATION ${TARGETDIR}
@@ -547,11 +545,11 @@ elseif(WIN32)
        if(WITH_CODEC_FFMPEG)
                install(
                        FILES
-                               ${LIBDIR}/ffmpeg-0.8/lib/avcodec-53.dll
-                               ${LIBDIR}/ffmpeg-0.8/lib/avformat-53.dll
-                               ${LIBDIR}/ffmpeg-0.8/lib/avdevice-53.dll
-                               ${LIBDIR}/ffmpeg-0.8/lib/avutil-51.dll
-                               ${LIBDIR}/ffmpeg-0.8/lib/swscale-2.dll
+                               ${LIBDIR}/ffmpeg/lib/avcodec-53.dll
+                               ${LIBDIR}/ffmpeg/lib/avformat-53.dll
+                               ${LIBDIR}/ffmpeg/lib/avdevice-53.dll
+                               ${LIBDIR}/ffmpeg/lib/avutil-51.dll
+                               ${LIBDIR}/ffmpeg/lib/swscale-2.dll
                        DESTINATION ${TARGETDIR}
                )
 
@@ -714,13 +712,16 @@ add_dependencies(blender makesdna)
 
 get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
-set(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
+set(BLENDER_LINK_LIBS
+       ${BLENDER_LINK_LIBS}
+       bf_windowmanager
+       bf_render
+)
 
 if(WITH_MOD_FLUID)
        list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
 endif()
 
-
 #if(UNIX)
        # Sort libraries
        set(BLENDER_SORTED_LIBS
@@ -770,6 +771,7 @@ endif()
                bf_python_ext
                bf_python_mathutils
                bf_ikplugin
+               bf_bmesh
                bf_modifiers
                bf_blenkernel
                bf_nodes
@@ -801,6 +803,7 @@ endif()
                extern_minilzo
                extern_lzma
                ge_logic_ketsji
+               extern_recastnavigation
                ge_phys_common
                ge_logic
                ge_rasterizer
@@ -808,7 +811,6 @@ endif()
                ge_logic_expressions
                ge_scenegraph
                ge_logic_network
-               bf_python # duplicate for BPY_driver_exec
                ge_logic_ngnetwork
                extern_bullet
                ge_logic_loopbacknetwork