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

[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  e58a44a35b0c64d8072d4663b68a5cfdebc6a83b (commit)
      from  30826905fb5989599ee4313e1d4af584ac478fb4 (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=e58a44a35b0c64d8072d4663b68a5cfdebc6a83b

commit e58a44a35b0c64d8072d4663b68a5cfdebc6a83b
Author: Juergen Kahrs <address@hidden>
Date:   Tue Apr 30 20:30:42 2013 +0200

    Found a clean way to auto-detect wctype_t and wint_t.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8ec550..cdc12df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,10 +45,7 @@ if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   # On Ubuntu 12.04 patches to gawk's source code are needed:
   #  - insert #include <windows.h> at the top of awk.h
   #  - remove function execvp from pc/gawkmisc.pc
-  DefineConfigHValue(HAVE_WCTYPE_T 1)
-  DefineConfigHValue(WEOF EOF)
   DefineConfigHValue(HAVE_USLEEP 1)
-  DefineConfigHValue(HAVE_WINT_T 1)
   DefineConfigHValue(HAVE_ISWUPPER 1)
   DefineConfigHValue(HAVE_SETENV 1)
   DefineConfigHValue(STDC_HEADERS 1)
diff --git a/cmake/configure.cmake b/cmake/configure.cmake
index 2f0823e..1c74bc5 100644
--- a/cmake/configure.cmake
+++ b/cmake/configure.cmake
@@ -189,20 +189,12 @@ DefineTypeIfAvailable("long long int" HAVE_LONG_LONG_INT)
 DefineTypeIfAvailable("unsigned long long int" HAVE_UNSIGNED_LONG_LONG_INT)
 DefineTypeIfAvailable(intmax_t INTMAX_T)
 DefineTypeIfAvailable(uintmax_t UINTMAX_T)
-
-# Some of these dont work, maybe CheckCSourceCompiles would be better.
 DefineTypeIfAvailable("time_t" TIME_T_IN_SYS_TYPES_H)
-DefineTypeIfAvailable("wctype_t" WCTYPE_T)
-# Detection of wint_t works but in an unsatisfying way.
-DefineIfSourceCompiles(
-     "#include \"wchar.h\"
-     static void testcb(wint_t w) { }
-     int main() {
-        wint_t w = 0;
-        testcb(w);
-        return 0;
-     }"
-     HAVE_WINT_T)
+SET(CMAKE_EXTRA_INCLUDE_FILES wctype.h)
+DefineTypeIfAvailable("wctype_t" HAVE_WCTYPE_T)
+DefineTypeIfAvailable("wint_t" HAVE_WINT_T)
+SET(CMAKE_EXTRA_INCLUDE_FILES)
+
 DefineStructHasMemberIfAvailable("struct sockaddr_storage" ss_family 
sys/socket.h HAVE_SOCKADDR_STORAGE)
 DefineStructHasMemberIfAvailable("struct stat" st_blksize sys/stat.h 
HAVE_STRUCT_STAT_ST_BLKSIZE)
 DefineStructHasMemberIfAvailable("struct stat" st_blksize sys/stat.h 
HAVE_ST_BLKSIZE)

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

Summary of changes:
 CMakeLists.txt        |    3 ---
 cmake/configure.cmake |   18 +++++-------------
 2 files changed, 5 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
gawk