Revision: 38852
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38852
Author: xiaoxiangquan
Date: 2011-07-30 14:05:48 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
fix of cmake rules for mac, from sirdude
Modified Paths:
--------------
branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-garlic/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-garlic/source/creator/CMakeLists.txt.rej
Modified: branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
2011-07-30 13:20:09 UTC (rev 38851)
+++ branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
2011-07-30 14:05:48 UTC (rev 38852)
@@ -218,6 +218,13 @@
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 @@
)
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
Modified: branches/soc-2011-garlic/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/source/creator/CMakeLists.txt 2011-07-30
13:20:09 UTC (rev 38851)
+++ branches/soc-2011-garlic/source/creator/CMakeLists.txt 2011-07-30
14:05:48 UTC (rev 38852)
@@ -352,6 +352,7 @@
)
if(WITH_INTERNATIONAL)
+
install(
FILES
${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
DESTINATION ${TARGETDIR_VER}
Added: branches/soc-2011-garlic/source/creator/CMakeLists.txt.rej
===================================================================
--- branches/soc-2011-garlic/source/creator/CMakeLists.txt.rej
(rev 0)
+++ branches/soc-2011-garlic/source/creator/CMakeLists.txt.rej 2011-07-30
14:05:48 UTC (rev 38852)
@@ -0,0 +1,29 @@
+--- creator/CMakeLists.txt (revision 38818)
++++ creator/CMakeLists.txt (working copy)
+@@ -666,20 +667,17 @@
+ if(WITH_INTERNATIONAL)
+ install(
+ FILES
${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
+- DESTINATION ${TARGETDIR_VER}/datafiles
++ DESTINATION ${TARGETDIR_VER}/datafiles/
+ )
+
+- install_dir(
++ install(
+ DIRECTORY
+-
${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+- \${TARGETDIR_VER}/datafiles/
++ ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
++ ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
++ DESTINATION ${TARGETDIR_VER}/datafiles/
++ PATTERN ".svn" EXCLUDE
+ )
+
+- install_dir(
+- DIRECTORY
+-
${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
+- \${TARGETDIR_VER}/datafiles/
+- )
+ endif()
+
+ # python
Property changes on: branches/soc-2011-garlic/source/creator/CMakeLists.txt.rej
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
