svn merge ^/trunk/blender -r43420:43436
[blender.git] / source / creator / CMakeLists.txt
index 581a50a8c39a2cd3b94402daae68ea73ce0f2094..5661282288783d5c6aecd1e78c6c8a77df341fb6 100644 (file)
@@ -178,6 +178,15 @@ if(WITH_PYTHON_MODULE)
                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
        )
 
+       if(APPLE)
+               set_target_properties(
+                       blender
+                       PROPERTIES
+                               LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
+                               LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
+               )
+       endif()
+
        if(WIN32)
                # python modules use this
                set_target_properties(
@@ -234,7 +243,11 @@ elseif(WIN32)
        set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
 
 elseif(APPLE)
-       set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
+       if(WITH_PYTHON_MODULE)
+               set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
+       else()
+               set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
+       endif()
 
 endif()
 
@@ -864,6 +877,10 @@ endif()
                list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
        endif()
 
+       if(WITH_CARVE)
+               list(APPEND BLENDER_SORTED_LIBS extern_carve)
+       endif()
+
        foreach(SORTLIB ${BLENDER_SORTED_LIBS})
                set(REMLIB ${SORTLIB})
                foreach(SEARCHLIB ${BLENDER_LINK_LIBS})