[gawk-diffs] [SCM] gawk branch, cmake, updated. 08fc54511a406a767652b617f9c8e293e794258a

[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  08fc54511a406a767652b617f9c8e293e794258a (commit)
      from  8401ded64836e829620dfbbc2b6edf731edfb337 (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=08fc54511a406a767652b617f9c8e293e794258a

commit 08fc54511a406a767652b617f9c8e293e794258a
Author: Juergen Kahrs <address@hidden>
Date:   Sun Feb 17 15:12:46 2013 +0100

    Pass a few more defined via config.h.

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index a4f3161..b064070 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -56,6 +56,11 @@ MACRO(DefineConfigH feature)
   endif ()
 ENDMACRO(DefineConfigH)
 
+MACRO(DefineConfigHValue feature value)
+  set(${feature} ${value})
+  DefineConfigH(${feature})
+ENDMACRO(DefineConfigHValue)
+
 MACRO(DefineFunctionIfAvailable func feature)
   check_function_exists("${func}" "${feature}")
   DefineConfigH(${feature})
@@ -92,16 +97,18 @@ STRING( REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" 
"\\1" GAWK_MAJOR_VERSION
 STRING( REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" 
GAWK_MINOR_VERSION "${GAWK_AUTOMAKE_LINE_VERSION}") 
 STRING( REGEX REPLACE ".*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" 
GAWK_BUGFIX_VERSION "${GAWK_AUTOMAKE_LINE_VERSION}") 
 
+# The definition for GAWK cannot be passed in config.he because
+# the extensions will fail to build.
 add_definitions(-DGAWK)
-set(GAWK_VERSION 
"${GAWK_MAJOR_VERSION}.${GAWK_MINOR_VERSION}.${GAWK_BUGFIX_VERSION}")
-add_definitions(-D VERSION=\\"${GAWK_VERSION}\\")
-add_definitions(-D PACKAGE=\\"gawk\\")
-add_definitions(-D PACKAGE_STRING="GNU Awk ${GAWK_VERSION}")
-add_definitions(-D PACKAGE_TARNAME=\\"gawk\\")
-add_definitions(-D PACKAGE_URL=\\"http://www.gnu.org/software/gawk/\\";)
-add_definitions(-D PACKAGE_VERSION=\\"${GAWK_VERSION}\\")
-add_definitions(-D DEFPATH=\\"${CMAKE_BINARY_DIR}/awk\\")
-add_definitions(-D DEFLIBPATH=\\"${CMAKE_BINARY_DIR}/lib\\")
+DefineConfigHValue(GAWK_VERSION 
"${GAWK_MAJOR_VERSION}.${GAWK_MINOR_VERSION}.${GAWK_BUGFIX_VERSION}")
+DefineConfigHValue(VERSION \\"${GAWK_VERSION}\\")
+DefineConfigHValue(PACKAGE \\"gawk\\")
+DefineConfigHValue(PACKAGE_STRING "GNU Awk ${GAWK_VERSION}")
+DefineConfigHValue(PACKAGE_TARNAME \\"gawk\\")
+DefineConfigHValue(PACKAGE_URL \\"http://www.gnu.org/software/gawk/\\";)
+DefineConfigHValue(PACKAGE_VERSION \\"${GAWK_VERSION}\\")
+DefineConfigHValue(DEFPATH \\"${CMAKE_BINARY_DIR}/awk\\")
+DefineConfigHValue(DEFLIBPATH \\"${CMAKE_BINARY_DIR}/lib\\")
 #DefineFunctionIfAvailable(dlopen DYNAMIC)
 DefineHFileIfAvailable(dlfcn.h DYNAMIC)
 #add_definitions(-D SHLIBEXT=\\"${CMAKE_SHARED_LIBRARY_SUFFIX}\\")

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

Summary of changes:
 cmake/configure.cmake |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk