[gawk-diffs] [SCM] gawk branch, cmake, updated. 030d19b3fa9ce83ebeedf4d9bf27a527977f01d7

[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  030d19b3fa9ce83ebeedf4d9bf27a527977f01d7 (commit)
      from  284608d0645dcb90d0a443f155bb9e513eaf9eff (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=030d19b3fa9ce83ebeedf4d9bf27a527977f01d7

commit 030d19b3fa9ce83ebeedf4d9bf27a527977f01d7
Author: Juergen Kahrs <address@hidden>
Date:   Tue Feb 19 21:10:00 2013 +0100

    Some more preparations for creating an NSIS installer.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97d415d..df4f8a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,10 +40,14 @@ endif ()
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  #DefineConfigHValue(NO_MBSSUPPORT 1)
+  DefineConfigHValue(WEOF EOF)
+  DefineConfigHValue(HAVE_USLEEP 1)
+  #DefineConfigHValue(__STDC__ 1)
   # awk.h changed
   # pc/gawkmisc.pc:605 execvp raus
-  set (GAWK_SOURCES ${GAWK_SOURCES} regex.c pc/getid.c)
+  set (GAWK_SOURCES ${GAWK_SOURCES} regex.c pc/getid.c pc/gawkmisc.pc)
   add_definitions(-D HAVE_WINT_T)
   add_definitions(-D HAVE_ISWUPPER)
   add_definitions(-D HAVE_SETENV)
@@ -81,13 +85,13 @@ set (GAWK_SOURCES ${GAWK_SOURCES}
 
 add_executable (gawk ${GAWK_SOURCES} ${BISON_awkgram_OUTPUTS})
 target_link_libraries (gawk m ${EXTRA_LIBS})
-install(PROGRAMS ${CMAKE_BINARY_DIR}/gawk DESTINATION bin)
+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")
+    # Beware: before building the extension, -DGAWK gets undefined.
+    add_subdirectory(extension)
+
     enable_testing()
     add_subdirectory(test)
     if (LATEX_COMPILER)

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

Summary of changes:
 CMakeLists.txt |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
gawk