[Bf-blender-cvs] [7c69215] master: CMake: disable international if the locale path is empty

[Campbell Barton]

Commit: 7c69215933f70473313b4eef87dd261df5346003
Author: Campbell Barton
Date:   Sun Feb 16 07:53:53 2014 +1100
https://developer.blender.org/rB7c69215933f70473313b4eef87dd261df5346003

CMake: disable international if the locale path is empty

This would happen when the submodules weren't initialized
but fail on `make install` with a not very helpful message.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3c97a4..6836121 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -512,9 +512,12 @@ endif()
 #-----------------------------------------------------------------------------
 # Check for valid directories
 # ... a partial checkout may cause this.
+#
+# note: we need to check for a known subdir in both cases.
+#       since uninitialized git submodules will give blank dirs
 
 if(WITH_INTERNATIONAL)
-	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale/languages")
 		message(WARNING "Translation path '${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
 						"This is a 'git submodule', which are known not to work with bridges to other version "
 						"control systems, disabling 'WITH_INTERNATIONAL'.")
@@ -523,7 +526,7 @@ if(WITH_INTERNATIONAL)
 endif()
 
 if(WITH_PYTHON)
-	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons")
+	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules")
 		message(WARNING "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
 						"This is a 'git submodule', which are known not to work with bridges to other version "
 						"control systems: * CONTINUING WITHOUT ADDONS *")