[Bf-blender-cvs] [ea6fd84] blender2.4: Build fix for 2.4x branch (CMake on recent Linux)

[Campbell Barton]

Commit: ea6fd84d6d13f93ff79004056244a12ef72ceaa7
Author: Campbell Barton
Date:   Mon Oct 20 09:56:43 2014 +0200
Branches: blender2.4
https://developer.blender.org/rBea6fd84d6d13f93ff79004056244a12ef72ceaa7

Build fix for 2.4x branch (CMake on recent Linux)

===================================================================

M	CMake/macros.cmake
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index e4ba662..8e82d0f 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -99,4 +99,8 @@ MACRO(SETUP_LIBLINKS
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)
+  IF(UNIX AND NOT APPLE)
+    TARGET_LINK_LIBRARIES(${target} ${CMAKE_DL_LIBS})
+    TARGET_LINK_LIBRARIES(${target} ${X11_X11_LIB})
+  ENDIF(UNIX AND NOT APPLE)
 ENDMACRO(SETUP_LIBLINKS)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index f31a683..1ba07e5 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -93,12 +93,20 @@ IF(UNIX AND NOT APPLE)
     MAIN_DEPENDENCY blender
     COMMAND rm -Rf ${TARGETDIR}/.blender
     COMMAND mkdir ${TARGETDIR}/.blender/
-    COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
-    COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
-    COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
     COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/.blender/
     COMMAND find ${TARGETDIR} -name CVS -prune -exec rm -rf {} "\;"
   )
+
+  IF(WITH_INTERNATIONAL)
+    ADD_CUSTOM_COMMAND(TARGET blender
+      POST_BUILD
+      MAIN_DEPENDENCY blender
+      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.bfont.ttf ${TARGETDIR}/.blender/
+      COMMAND cp ${CMAKE_SOURCE_DIR}/bin/.blender/.Blanguages ${TARGETDIR}/.blender/
+      COMMAND cp -R ${CMAKE_SOURCE_DIR}/bin/.blender/locale ${TARGETDIR}/.blender/
+    )
+  ENDIF(WITH_INTERNATIONAL)
+
 ENDIF(UNIX AND NOT APPLE)
 
 IF(APPLE)