[gawk-diffs] [SCM] gawk branch, cmake, updated. 3473e4d1cd41d32c1b902dd17e56977bf9051c2b

[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  3473e4d1cd41d32c1b902dd17e56977bf9051c2b (commit)
      from  451a255062f7e54bb6654ea8ea437cfbb4ec929d (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=3473e4d1cd41d32c1b902dd17e56977bf9051c2b

commit 3473e4d1cd41d32c1b902dd17e56977bf9051c2b
Author: Juergen Kahrs <address@hidden>
Date:   Mon Mar 11 08:53:22 2013 +0100

    Search for bison on all platforms and let it generate awkgram.c. Use 
existing awkgram.c otherwise.

diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index d7e44cf..ddb54b9 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -248,12 +248,17 @@ DefineFunctionIfAvailable(mbrtowc HAVE_MBRTOWC)
 add_definitions(-D HAVE_STRINGIZE)
 add_definitions(-D _Noreturn=)
 
-if (CMAKE_HOST_UNIX)
-  find_package(BISON REQUIRED)
-  if (${BISON_FOUND} STREQUAL "TRUE")
-    BISON_TARGET(awkgram awkgram.y ${CMAKE_SOURCE_DIR}/awkgram.c)
-  endif()
+find_package(BISON QUIET)
+# If there is a bison installed on this platform,
+if (${BISON_FOUND} STREQUAL "TRUE")
+  # then let bison generate awkgram.c.
+  BISON_TARGET(awkgram awkgram.y ${CMAKE_SOURCE_DIR}/awkgram.c)
+else()
+  # otherwise use the existing awkgram.c.
+  set(BISON_awkgram_OUTPUTS ${CMAKE_SOURCE_DIR}/awkgram.c)
+endif()
 
+if (CMAKE_HOST_UNIX)
   #http://www.cmake.org/cmake/help/v2.8.10/cmake.html#module:FindGettext
   find_package(Gettext REQUIRED)
   if (GETTEXT_FOUND STREQUAL "TRUE")

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

Summary of changes:
 cmake/configure.cmake |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk