New commits:
commit 950e372a5e93743aeaa0aebca7529b5040e0d262
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
irrlicht 1.8.5
commit 86254442ebe9ba8e069dd7458e9b56984e98feed
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
Update CMake functions from main grimoire
diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index ae19da8..f03d7d4 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -2,14 +2,4 @@ config_query_list CM_BUILD_TYPE 'which build type?'
Release Debug RelWithDebIn
#if is_depends_enabled $SPELL extra-cmake-modules;then
config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
#fi
-
-# Default to Ninja cmake generator if it's installed, otherwise the standard
Unix way
-if spell_ok ninja-build-system; then
- message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using ${SPELL_COLOR}ninja${DEFAULT_COLOR}${MESSAGE_COLOR} for CMAKE
GENERATOR." &&
- CMAKE_GEN='Ninja'
-else
- message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using \"Unix Makefiles\" for CMAKE GENERATOR." &&
- CMAKE_GEN='Unix Makefiles'
-fi &&
-
-persistent_add CMAKE_GEN
+persistent_remove CMAKE_GEN
diff --git a/CMAKE_DEPENDS b/CMAKE_DEPENDS
index 8840cf4..90b3ead 100755
--- a/CMAKE_DEPENDS
+++ b/CMAKE_DEPENDS
@@ -1,5 +1,2 @@
depends cmake &&
-
-if [[ $CMAKE_GEN == Ninja ]];then
- depends ninja-build-system
-fi
+optional_depends ninja-build-system ' -G Ninja' '' 'faster builds'
diff --git a/FUNCTIONS b/FUNCTIONS
index f397166..8d7d2bc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -77,17 +77,53 @@ function default_games_build() {
default_build
}
+# cmake flags use : which is an internal sorcery delimiter.
+# In order to facilitate the passing of depends flags, use % instead and call
+# this function at the start of BUILD. Don't use it anywhere else.
+# Example:
+# DEPENDS: depends kdelibs4 -DCRUFT%BOOL=FALSE; ...
+# BUILD: prepare_cmake_flags; ...
+function prepare_cmake_flags()
+{
+ OPTS="${OPTS//%/:}"
+}
+
#---
## @Synopsis cmake_build function to build
## @Synopsis source code with cmake
#---