diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-16 00:53:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-16 00:55:28 +0400 |
| commit | 7c69215933f70473313b4eef87dd261df5346003 (patch) | |
| tree | 4d78b9646423c1a3e8816c2823c217160ed39293 /CMakeLists.txt | |
| parent | aa517ab3a4b93083f0dbf7adc026310945f8d358 (diff) | |
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.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3c97a4c2c0..6836121fdc3 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 *") |