[gawk-diffs] [SCM] gawk branch, cmake, updated. 74db9f3cb12c4c45487b8646473daad7d0df641f

[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  74db9f3cb12c4c45487b8646473daad7d0df641f (commit)
      from  730a2388f18c57478fb0afa07b15947616f84c5a (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=74db9f3cb12c4c45487b8646473daad7d0df641f

commit 74db9f3cb12c4c45487b8646473daad7d0df641f
Author: Juergen Kahrs <address@hidden>
Date:   Sun Apr 28 19:23:08 2013 +0200

    On Win32 platforms a native build with MinGW works now.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd13ef6..c8ec550 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,7 @@ if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   # pc/config.h. With these settings and DYNAMIC=1
   # it looks like functions in dynamic libs (extensions) can
   # be invoked on Windows.
+  DefineConfigHValue(HAVE_GETSYSTEMTIMEASFILETIME 1)
   set (GAWK_SOURCES ${GAWK_SOURCES} regex.c pc/getid.c pc/gawkmisc.pc 
pc/popen.c)
   include_directories(${CMAKE_SOURCE_DIR}/pc)
 endif()
@@ -93,18 +94,11 @@ add_executable (gawk ${GAWK_SOURCES} 
${BISON_awkgram_OUTPUTS})
 target_link_libraries (gawk m ${EXTRA_LIBS})
 install(PROGRAMS ${CMAKE_BINARY_DIR}/gawk${CMAKE_EXECUTABLE_SUFFIX} 
DESTINATION bin)
 
-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)
-  endif()
-
-  add_subdirectory(doc)
-
-  include(InstallRequiredSystemLibraries)
-  set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
-  include(cmake/package.cmake)
-endif()
+# Beware: before building the extension, -DGAWK gets undefined.
+add_subdirectory(extension)
+enable_testing()
+add_subdirectory(test)
+add_subdirectory(doc)
+include(InstallRequiredSystemLibraries)
+set(CPACK_PACKAGING_INSTALL_PREFIX /usr)
+include(cmake/package.cmake)
diff --git a/cmake/README.txt b/cmake/README.txt
index f4feaf7..60dde15 100644
--- a/cmake/README.txt
+++ b/cmake/README.txt
@@ -62,7 +62,20 @@ Use "make package". The exact kind of installable file 
depends on your
 operating system and defaults to TGZ.
 
 - Can I build an executable that runs on any Win32 platform ?
-It is possible to build for the target Win32, but only with cross-compilers
-on certain platforms. You need a MinGW cross-compiler and the NSIS package
-builder.
+Yes, there are two ways of doing this.
+In both cases you need a MinGW compiler and the NSIS package builder
+installed on the host that shall do the build.
+  http://sourceforge.net/projects/mingw
+  http://sourceforge.net/projects/nsis
+When installed properly, the NSIS tool can even build an installer file
+(a single .exe file that unpacks, registers and installs the gawk executable
+and several other files).
+1. way: native build on a Win32 platform 
+   http://www.cmake.org/cmake/help/runningcmake.html
+   After clicking "Configure" select the MinGW option with the default native 
compiler
+   In the build directory, the command "mingw32-make" will build the gawk.exe
+   The command "mingw32-make package" will build installer file
+2. way: build with cross-compiler on a Linux platform like Ubuntu 12.04 LTS
+   Proceed as describe above for cross-compilers.
+   The command "make ; make package" will build gawk.exe and the installer file
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5f36c75..ba1cc5c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -30,8 +30,8 @@ execute_process(
   OUTPUT_VARIABLE BASIC_TESTS
 )
 
-string(REGEX REPLACE "Gt-dummy:\n" "" BASIC_TESTS ${BASIC_TESTS})
-string(REGEX REPLACE ":\n" ";"        BASIC_TESTS ${BASIC_TESTS})
+string(REGEX REPLACE "Gt-dummy:\n" "" BASIC_TESTS "${BASIC_TESTS}")
+string(REGEX REPLACE ":\n" ";"        BASIC_TESTS "${BASIC_TESTS}")
 foreach(testcase ${BASIC_TESTS} )
   set(options "")
   if(${testcase} STREQUAL lintold)

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

Summary of changes:
 CMakeLists.txt      |   24 +++++++++---------------
 cmake/README.txt    |   19 ++++++++++++++++---
 test/CMakeLists.txt |    4 ++--
 3 files changed, 27 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
gawk