[gawk-diffs] [SCM] gawk branch, cmake, updated. f4eb81006930f3d2fe944298b63bb546f0ee3e9f

[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  f4eb81006930f3d2fe944298b63bb546f0ee3e9f (commit)
      from  13eee814c9d9e5c7b4cf0e0f55c23951fec443f2 (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=f4eb81006930f3d2fe944298b63bb546f0ee3e9f

commit f4eb81006930f3d2fe944298b63bb546f0ee3e9f
Author: Juergen Kahrs <address@hidden>
Date:   Mon Feb 18 18:35:09 2013 +0100

    Testing, documentation, gettext and bison only on UNIX-based systems.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d3920..97d415d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,17 +83,19 @@ add_executable (gawk ${GAWK_SOURCES} 
${BISON_awkgram_OUTPUTS})
 target_link_libraries (gawk m ${EXTRA_LIBS})
 install(PROGRAMS ${CMAKE_BINARY_DIR}/gawk DESTINATION bin)
 
-# Beware: before building the extension, -DGAWK gets undefined.
-add_subdirectory(extension)
+if (CMAKE_HOST_UNIX)
+  # Beware: before building the extension, -DGAWK gets undefined.
+  add_subdirectory(extension)
 
-if(NOT ${CMAKE_CROSSCOMPILING} STREQUAL "TRUE")
-  enable_testing()
-  add_subdirectory(test)
-  if (LATEX_COMPILER)
-    add_subdirectory(doc)
+  if(NOT ${CMAKE_CROSSCOMPILING} STREQUAL "TRUE")
+    enable_testing()
+    add_subdirectory(test)
+    if (LATEX_COMPILER)
+      add_subdirectory(doc)
+    endif()
   endif()
-endif()
 
-include(InstallRequiredSystemLibraries)
-set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
-include(cmake/package.cmake)
+  include(InstallRequiredSystemLibraries)
+  set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
+  include(cmake/package.cmake)
+endif()
diff --git a/cmake/Toolchain_generic.cmake b/cmake/Toolchain_generic.cmake
index bbd2559..91ddc6e 100644
--- a/cmake/Toolchain_generic.cmake
+++ b/cmake/Toolchain_generic.cmake
@@ -10,7 +10,7 @@ SET(CMAKE_C_COMPILER /usr/bin/gcc)
 
 # here is the target environment located
 # Settings for Ubuntu 12.04.1 LTS
-SET(CMAKE_FIND_ROOT_PATH  /usr/include)
+SET(CMAKE_FIND_ROOT_PATH  /usr/)
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
diff --git a/cmake/Toolchain_mingw32.cmake b/cmake/Toolchain_mingw32.cmake
index 8f1d2fb..bb885f2 100644
--- a/cmake/Toolchain_mingw32.cmake
+++ b/cmake/Toolchain_mingw32.cmake
@@ -12,7 +12,7 @@ SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
 
 # here is the target environment located
 # Settings for Ubuntu 12.04.1 LTS
-SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32 /usr/i686-w64-mingw32/include)
+SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32)
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search 
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 38265b9..cd66e24 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -143,13 +143,15 @@ DefineHFileIfAvailable(stdint.h HAVE_STDINT_H)
 DefineHFileIfAvailable(inttypes.h HAVE_INTTYPES_H)
 DefineHFileIfAvailable(stdlib.h HAVE_STDLIB_H)
 DefineHFileIfAvailable(unistd.h HAVE_UNISTD_H)
-DefineFunctionIfAvailable(gettext HAVE_GETTEXT)
-DefineFunctionIfAvailable(dcgettext HAVE_DCGETTEXT)
+if (CMAKE_HOST_UNIX)
+  DefineFunctionIfAvailable(gettext HAVE_GETTEXT)
+  DefineFunctionIfAvailable(dcgettext HAVE_DCGETTEXT)
   FIND_PACKAGE(Gettext REQUIRED)
-#  FIND_PACKAGE(XGettext REQUIRED)
-#  FIND_PACKAGE(Iconv REQUIRED)
+  #  FIND_PACKAGE(XGettext REQUIRED)
+  #  FIND_PACKAGE(Iconv REQUIRED)
   FIND_PATH(INTL_INCLUDE_DIR libintl.h PATHS /usr/include /usr/local/include)
   FIND_LIBRARY(INTL_LIBRARIES intl c PATHS /usr/lib/ /usr/local/lib)
+endif()
 DefineSymbolIfAvailable("CODESET" "langinfo.h" HAVE_LANGINFO_CODESET)
 DefineSymbolIfAvailable("LC_MESSAGES" "locale.h" HAVE_LC_MESSAGES)
 DefineTypeIfAvailable("_Bool" HAVE__BOOL)
@@ -246,22 +248,24 @@ DefineFunctionIfAvailable(mbrtowc HAVE_MBRTOWC)
 add_definitions(-D HAVE_STRINGIZE)
 add_definitions(-D _Noreturn=)
 
-find_package(BISON REQUIRED)
-if (${BISON_FOUND} STREQUAL "TRUE")
-  BISON_TARGET(awkgram awkgram.y ${CMAKE_SOURCE_DIR}/awkgram.c)
-endif()
+if (CMAKE_HOST_UNIX)
+  find_package(BISON REQUIRED)
+  if (${BISON_FOUND} STREQUAL "TRUE")
+    BISON_TARGET(awkgram awkgram.y ${CMAKE_SOURCE_DIR}/awkgram.c)
+  endif()
 
-#http://www.cmake.org/cmake/help/v2.8.10/cmake.html#module:FindGettext
-find_package(Gettext REQUIRED)
-if (GETTEXT_FOUND STREQUAL "TRUE")
-  include_directories(${GETTEXT_INCLUDE_DIR})
-else ()
-  message( FATAL_ERROR "Gettext not found" )
-endif()
+  #http://www.cmake.org/cmake/help/v2.8.10/cmake.html#module:FindGettext
+  find_package(Gettext REQUIRED)
+  if (GETTEXT_FOUND STREQUAL "TRUE")
+    include_directories(${GETTEXT_INCLUDE_DIR})
+  else ()
+    message( FATAL_ERROR "Gettext not found" )
+  endif()
 
-find_package(LATEX)
-include(GNUInstallDirs)
-include(GetPrerequisites)
+  find_package(LATEX)
+  include(GNUInstallDirs)
+  include(GetPrerequisites)
+endif()
 
 # For some unknown reason the defines for the extension
 # are written into config.h only if they are implemented

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

Summary of changes:
 CMakeLists.txt                |   24 +++++++++++++-----------
 cmake/Toolchain_generic.cmake |    2 +-
 cmake/Toolchain_mingw32.cmake |    2 +-
 cmake/configure.cmake         |   40 ++++++++++++++++++++++------------------
 4 files changed, 37 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
gawk