[gawk-diffs] [SCM] gawk branch, cmake, updated. gawk-4.1.0-97-g6013197

[Juergen Kahrs]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, cmake has been updated
       via  6013197b678697404fe44e8db58a9d40a2832ce4 (commit)
      from  2dbda7d9bb23f050673841c42f845be539e19a2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=6013197b678697404fe44e8db58a9d40a2832ce4

commit 6013197b678697404fe44e8db58a9d40a2832ce4
Author: Juergen Kahrs <address@hidden>
Date:   Sun May 19 18:29:01 2013 +0200

    configure parameters --srcdir and --with-whiny-user-strftime work now.

diff --git a/cmake/configure b/cmake/configure
index 356bdfc..d375a81 100755
--- a/cmake/configure
+++ b/cmake/configure
@@ -26,20 +26,18 @@ if [ -f CMakeLists.txt ] ; then
   exit 1
 fi
 
-if ! [ -f ../CMakeLists.txt ] ; then
-  echo "The directory above your current working directory does not contain a 
file CMakeLists.txt."
-  echo "This script will run only if you are one level below the source 
directory."
-  exit 1
-fi
-
 # TODO: Evaluate all the options and translate the options into CMake 
variables.
 CC=$( which cc )
 PREFIX=""
+SRCDIR=".."
+WHINY=""
 
 for p in $@
 do
   if [ ${p:0:3} = "CC=" ]; then CC=${p:3}; fi
   if [ ${p:0:9} = "--prefix=" ]; then PREFIX=-DCMAKE_INSTALL_PREFIX=${p:9}; fi
+  if [ ${p:0:9} = "--srcdir=" ]; then SRCDIR=${p:9}; fi
+  if [ ${p:0:26} = "--with-whiny-user-strftime" ]; then 
WHINY=-DUSE_INCLUDED_STRFTIME=1; fi
 done
 CC=$( which $CC )
 
@@ -51,7 +49,10 @@ rm -f Toolchain.cmake
   echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"
 ) > Toolchain.cmake
 
-# TODO: Allow the build directory to be in other places.
-# A parameter is needed to pass the value.
-cmake ${PREFIX} -DCMAKE_TOOLCHAIN_FILE=Toolchain.cmake ..
+if ! [ -f ${SRCDIR}/CMakeLists.txt ] ; then
+  echo "The source directory (${SRCDIR}) does not contain a file 
CMakeLists.txt."
+  exit 1
+fi
+
+cmake ${PREFIX} ${WHINY} -DCMAKE_TOOLCHAIN_FILE=Toolchain.cmake ${SRCDIR}
 

-----------------------------------------------------------------------

Summary of changes:
 cmake/configure |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk