Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (fac5120650c12c1522f87b0bcd63890175357fc8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (fac5120650c12c1522f87b0bcd63890175357fc8)
  • Date: Fri, 11 Mar 2016 18:18:10 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

CMAKE_CONFIGURE | 11 ++++++++++-
ChangeLog | 4 ++++
2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit fac5120650c12c1522f87b0bcd63890175357fc8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

CMAKE_CONFIGURE: Default to "Unix Makefiles" for CMAKE_GEN

Error without ninja installed:
CMake was unable to find a build program corresponding to "Ninja".
CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build
tool.

Override CMAKE_GEN based on status of the ninja package. Since we make
this persistent (for subsequent files such as BUILD to see CMAKE_GEN) if
we accept a pre-defined value, then once we've cast with or without
ninja, forever will this dominate our destiny. Or something.

commit b209e65289ed1cfa2dd8f79e26e0d272b84d5952
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "opencv: Default CMAKE_GEN to "Unix Makefiles""

This reverts commit 75064785256bfeb553467b94f9f11967fec38b98.

Let's do this the Right Way(TM) in CMAKE_CONFIGURE.

commit e9c38dfd78a6439365e5f6639dcf6a0b7ec1a834
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

opencv: Default CMAKE_GEN to "Unix Makefiles"

Not sure why $GRIMOIRE/CMAKE_CONFIGURE defaults to "Ninja"
CMake Error:
CMake was unable to find a build program corresponding to "Ninja".
CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build
tool.

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index 5bc94a1..f330ece 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -2,5 +2,14 @@ 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
-CMAKE_GEN=${CMAKE_GEN:-Ninja}
+
+# Default to Ninja cmake generator if it's installed, otherwise the standard
Unix way
+if spell_ok ninja; 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
diff --git a/ChangeLog b/ChangeLog
index 036aea8..7a307d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-11 Eric Sandall <sandalle AT sourcemage.org>
+ * CMAKE_CONFIGURE: Default to "Unix Makefiles" for CMAKE_GEN
+ Error: CMake was unable to find a build program corresponding to
"Ninja". CMAKE_MAKE_PROGRAM is not set. You probably need to select a
different build tool.
+
2016-03-09 Thomas Orgis <sobukus AT sourcemage.org>
* FUNCTIONS: hack waf_build to enable CXXFLAGS, if possible




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (fac5120650c12c1522f87b0bcd63890175357fc8), Eric Sandall, 03/11/2016

Archive powered by MHonArc 2.6.24.

Top of Page