From 030d19b3fa9ce83ebeedf4d9bf27a527977f01d7 Mon Sep 17 00:00:00 2001 From: Juergen Kahrs Date: Tue, 19 Feb 2013 21:10:00 +0100 Subject: Some more preparations for creating an NSIS installer. --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97d415d3..df4f8a2b 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) -- cgit v1.2.3