From 66d1707293f53d78978b7bcbc1d13d35e2d4398b Mon Sep 17 00:00:00 2001 From: Xiao Xiangquan Date: Sat, 30 Jul 2011 14:05:48 +0000 Subject: [PATCH] fix of cmake rules for mac, from sirdude --- source/blender/makesrna/intern/CMakeLists.txt | 13 ++++++++++++- source/creator/CMakeLists.txt | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index be58daa1ac4..0f243cd6081 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -218,6 +218,13 @@ if(WITH_OPENCOLLADA) add_definitions(-DWITH_COLLADA) endif() +if(WITH_INTERNATIONAL) + list(APPEND INC_SYS ${GETTEXT_INC}) + add_definitions(-DINTERNATIONAL) + link_directories(${GETTEXT_LIBPATH}) + link_directories(${ICONV_LIBPATH}) +endif() + # Build makesrna executable blender_include_dirs( . @@ -243,7 +250,11 @@ blender_include_dirs_sys( ) add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC}) -target_link_libraries(makesrna bf_dna) +if (WITH_INTERNATIONAL) + target_link_libraries(makesrna bf_dna ${GETTEXT_LIB} ${PLATFORM_LINKFLAGS}) +else() + target_link_libraries(makesrna bf_dna) +endif() # Output rna_*_gen.c # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c51adae90a6..2997e1a97d9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -352,6 +352,7 @@ if(UNIX AND NOT APPLE) ) if(WITH_INTERNATIONAL) + install( FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages DESTINATION ${TARGETDIR_VER}