diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-20 11:56:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-20 11:56:43 +0400 |
| commit | ea6fd84d6d13f93ff79004056244a12ef72ceaa7 (patch) | |
| tree | 705c0141562c66fe2750c9daf663a47d50590a6a | |
| parent | ea1eca85a59c32072403bcde2bcb9c60add8dc09 (diff) | |
Build fix for 2.4x branch (CMake on recent Linux)blender2.4
| -rw-r--r-- | CMake/macros.cmake | 4 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index e4ba662eefb..8e82d0f5300 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 f31a68365fb..1ba07e50cba 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) |