gnucash-on-windows master: Change for cmake instead of defining .

John Ralls jralls at code.gnucash.org
Sat Apr 23 15:35:45 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/3924a2fa (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/833d3c77 (commit)



commit 3924a2fa0e15bc24c03cb82e671559eb56b5c08a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Apr 23 19:35:28 2016 +0000

    Change  for cmake instead of defining .
    
    Removes need for some other  checks.

diff --git a/defaults.sh b/defaults.sh
index f109293..0a8631a 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -47,6 +47,9 @@ else
     fi
 fi
 set_default BUILD_DIR $GNUCASH_DIR\\build
+if [ x"$WITH_CMAKE" = xyes ]; then
+    set_default BUILD_DIR $GNUCASH_DIR\\cmake-build
+fi
 set_default INSTALL_DIR $GNUCASH_DIR\\inst
 
 set_default DIST_DIR $GNUCASH_DIR\\dist
@@ -55,7 +58,7 @@ set_default WITH_CUTECASH no
 set_default WITH_CMAKE no
 set_default WITH_NINJA no
 set_default CUTECASH_BUILD_DIR $GNUCASH_DIR\\build-cutecash
-set_default GNUCASH_CMAKE_BUILD_DIR $GNUCASH_DIR\\build-cmake
+
 
 
 ####
diff --git a/dist-impl.sh b/dist-impl.sh
index a41f13e..eacbec7 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -36,7 +36,6 @@ function dist_prepare() {
     _GC_WIN_REPOS_UDIR=`unix_path $GC_WIN_REPOS_DIR`
     _REPOS_UDIR=`unix_path $REPOS_DIR`
     _BUILD_UDIR=`unix_path $BUILD_DIR`
-    _GNUCASH_CMAKE_BUILD_UDIR=`unix_path $GNUCASH_CMAKE_BUILD_DIR`
     _DIST_UDIR=`unix_path $DIST_DIR`
     _MINGW_UDIR=`unix_path $MINGW_DIR`
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
@@ -262,7 +261,7 @@ function dist_gnucash() {
     GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
     GNUCASH_CONFIG_H=${_BUILD_UDIR}/config.h
     if [ "$WITH_CMAKE" == "yes" ]; then
-        GNUCASH_CONFIG_H=${_GNUCASH_CMAKE_BUILD_UDIR}/src/config.h
+        GNUCASH_CONFIG_H=${_BUILD_UDIR}/src/config.h
     fi
 
     _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
diff --git a/install-impl.sh b/install-impl.sh
index 88f0e46..654e2d9 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1322,7 +1322,7 @@ function inst_cutecash() {
 function inst_gnucash_using_cmake() {
     setup "Gnucash (using cmake)"
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
-    _BUILD_UDIR=`unix_path  $GNUCASH_CMAKE_BUILD_DIR`
+    _BUILD_UDIR=`unix_path  $BUILD_DIR`
     _GLOBAL_UDIR=`unix_path $GLOBAL_DIR`
     _REPOS_UDIR=`unix_path  $REPOS_DIR`
     _NINJA_UDIR=`unix_path  $NINJA_DIR`



Summary of changes:
 defaults.sh     | 5 ++++-
 dist-impl.sh    | 3 +--
 install-impl.sh | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list