[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44857] trunk/blender/CMakeLists.txt: print warning when release/datafiles/ locale is missing when building with cmake (git-svn causes this).

Campbell Barton ideasman42 at gmail.com
Tue Mar 13 23:27:24 CET 2012


Revision: 44857
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44857
Author:   campbellbarton
Date:     2012-03-13 22:27:21 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
print warning when release/datafiles/locale is missing when building with cmake (git-svn causes this).

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-03-13 20:24:05 UTC (rev 44856)
+++ trunk/blender/CMakeLists.txt	2012-03-13 22:27:21 UTC (rev 44857)
@@ -292,6 +292,7 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
+
 #-----------------------------------------------------------------------------
 # Check for conflicting/unsupported configurations
 
@@ -351,7 +352,14 @@
 	set(WITH_BOOST ON)
 endif()
 
-TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
+if(WITH_INTERNATIONAL)
+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+		message(WARNING "Translation path '${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
+						"This is an 'svn external', which are known not to work with bridges to other version "
+						"control systems, disabling 'WITH_INTERNATIONAL'.")
+		set(WITH_INTERNATIONAL OFF)
+	endif()
+endif()
 
 # don't store paths to libs for portable distrobution
 if(WITH_INSTALL_PORTABLE)
@@ -362,7 +370,9 @@
     set(WITH_GHOST_XDND OFF)
 endif()
 
+TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
 
+
 #-----------------------------------------------------------------------------
 # Initialize un-cached vars, avoid unused warning
 




More information about the Bf-blender-cvs mailing list