diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extension/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ef31f39a..154d2afb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,9 @@ if(WIN32 OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") DefineConfigHValue(HAVE_USLEEP 1) DefineConfigHValue(STDC_HEADERS 1) DefineConfigHValue(HAVE_STRINGIZE 1) + include_directories(${CMAKE_SOURCE_DIR}/missing_d) + DefineConfigHValue(HAVE_MKSTEMP 1) + set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32) # TODO: Eli Zaretskii remined me that the generated # settings in config.h should be the same as those in # pc/config.h. With these settings and DYNAMIC=1 diff --git a/extension/CMakeLists.txt b/extension/CMakeLists.txt index 92e6b972..1bb4ceb1 100644 --- a/extension/CMakeLists.txt +++ b/extension/CMakeLists.txt @@ -24,11 +24,12 @@ ## process this file with CMake to produce Makefile +# Remove the definition of GAWK because of gawkapi.h. remove_definitions(-DGAWK) MACRO(BuildExtension name sources) add_library (${name} MODULE ${sources} ${ARGN}) - target_link_libraries(${name}) + target_link_libraries(${name} ${EXTRA_LIBS}) set_target_properties(${name} PROPERTIES PREFIX "") install(PROGRAMS ${CMAKE_BINARY_DIR}/extension/${name}${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION lib) ENDMACRO(BuildExtension) @@ -39,7 +40,7 @@ else() message(STATUS "extension filefuncs cannot be built because HAVE_STRUCT_STAT_ST_BLKSIZE is missing") endif() -if (${HAVE_FNMATCH} AND ${HAVE_FNMATCH_H}) +if (HAVE_FNMATCH AND HAVE_FNMATCH_H) BuildExtension(fnmatch fnmatch.c) else() message(STATUS "extension fnmatch cannot be built because function fnmatch or fnmatch.h is missing") @@ -75,11 +76,7 @@ else() message(STATUS "extension revtwoway cannot be built because function getdtablesize is missing") endif() -if (${HAVE_ARPA_INET_H}) - BuildExtension(rwarray rwarray.c) -else() - message(STATUS "extension rwarray cannot be built because HAVE_ARPA_INET_H is missing") -endif() +BuildExtension(rwarray rwarray.c) BuildExtension(time time.c) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3c3b88b0..fee5eeca 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -82,9 +82,6 @@ if(WIN32) file(APPEND ${CTestCustom} " SHLIB.fork2\n") file(APPEND ${CTestCustom} " SHLIB.fts\n") file(APPEND ${CTestCustom} " SHLIB.functab4\n") - file(APPEND ${CTestCustom} " SHLIB.inplace1\n") - file(APPEND ${CTestCustom} " SHLIB.inplace2\n") - file(APPEND ${CTestCustom} " SHLIB.inplace3\n") file(APPEND ${CTestCustom} " SHLIB.readdir\n") file(APPEND ${CTestCustom} " SHLIB.revtwoway\n") file(APPEND ${CTestCustom} " SHLIB.rwarray\n") |