Merged changes in the trunk up to revision 52690.
[blender.git] / source / creator / CMakeLists.txt
index f986e30b10cce8ae732900ef0c9c82bacc0aaf46..67bf9599baf9886c51949c0d74672af208eca46d 100644 (file)
@@ -470,30 +470,19 @@ elseif(WIN32)
                DESTINATION ${TARGETDIR}
        )
 
-       if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
-               install(
-                       FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-                       DESTINATION ${TARGETDIR}
-               )
-
-               if(NOT CMAKE_CL_64)
-                       install(
-                               FILES ${LIBDIR}/iconv/lib/iconv.dll
-                               DESTINATION ${TARGETDIR}
-                       )
-               endif()
-       endif()
-
        if(WITH_PYTHON)
                set_lib_path(PYLIB "python")
+
+               STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+
                install(
-                       FILES ${PYLIB}/lib/python32.dll
+                       FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
                )
 
                install(
-                       FILES ${PYLIB}/lib/python32_d.dll
+                       FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Debug
                )
@@ -517,10 +506,10 @@ elseif(WIN32)
                                "
                                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\")
+                                               \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_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\")
+                                               \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}.tar.gz\")
                                endif()
                                "
                        )
@@ -528,10 +517,12 @@ elseif(WIN32)
                        # doesnt work, todo
                        # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
                endif()
+
+               unset(_PYTHON_VERSION_NO_DOTS)
        endif()
 
        if(CMAKE_CL_64)
-               # gettext and png are statically linked on win64
+               # png is statically linked on win64
                install(
                        FILES ${LIBDIR}/zlib/lib/zlib.dll
                        DESTINATION ${TARGETDIR}
@@ -633,18 +624,7 @@ elseif(WIN32)
        install( # x86 builds can run on x64 Windows, so this is required at all times
                FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
                DESTINATION ${TARGETDIR}
-       )       
-
-       if(WITH_OPENIMAGEIO)
-               if(NOT MINGW)
-                       set(OIIOBIN ${LIBDIR}/openimageio)
-                       install(
-                               FILES
-                                       ${OIIOBIN}/bin/OpenImageIO.dll
-                               DESTINATION ${TARGETDIR}
-                       )
-               endif()
-       endif()
+       )
 
        if(WITH_OPENCOLORIO)
                set(OCIOBIN ${LIBDIR}/opencolorio/bin)
@@ -682,7 +662,7 @@ elseif(APPLE)
                )
        endmacro()
 
-       set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
+       set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app)
 
        # setup Info.plist
        execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -741,7 +721,7 @@ elseif(APPLE)
        # 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}/source/darwin/blenderplayer.app)
+               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 ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})
 
@@ -989,6 +969,10 @@ endif()
                list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
        endif()
 
+       if(WITH_INTERNATIONAL)
+               list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
+       endif()
+
        foreach(SORTLIB ${BLENDER_SORTED_LIBS})
                set(REMLIB ${SORTLIB})
                foreach(SEARCHLIB ${BLENDER_LINK_LIBS})