Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-14 04:30:20 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-14 04:30:20 +0400
commitf80fa544281afb22815ca083d0badd3a9979d17d (patch)
tree90e76e0c99dd410e60ea97ae32d05148f859f95e /CMakeLists.txt
parenta64ee8433a57d961faab1c6eee6107cdedc944b7 (diff)
documentation edit to address bmesh py api bug [#30453]
warn when addons are not found when running cmake.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt31
1 files changed, 22 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c1130ac1aa..ddf2f18312c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,15 +352,6 @@ if(WITH_CYCLES OR WITH_CARVE)
set(WITH_BOOST ON)
endif()
-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)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
@@ -374,6 +365,28 @@ TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
#-----------------------------------------------------------------------------
+# Check for valid directories
+# ... svn extern paths can be missing because of svn-git.
+
+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()
+
+if(WITH_PYTHON)
+ if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons")
+ message(WARNING "Addons path '${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
+ "This is an 'svn external', which are known not to work with bridges to other version "
+ "control systems: * CONTINUING WITHOUT ADDONS *")
+ set(WITH_INTERNATIONAL OFF)
+ endif()
+endif()
+
+#-----------------------------------------------------------------------------
# Initialize un-cached vars, avoid unused warning
# linux only, not cached