libzip: repository: fd6134107791

Navigation

Views: changesets, files, tags, branches

Formats: changeset, raw, files

Download: bz2 zip gz

changeset 1219:fd6134107791

Link in getopt.c where needed. Last part of the build fixes for Windows, tested by Kohei Yoshida.
author Thomas Klausner <tk@giga.or.at>
date Fri, 31 Aug 2012 21:47:59 +0200
parents e07a002dd8ca
children 9e0aa3c568d1
files regress/CMakeLists.txt
diffstat 1 files changed, 22 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/regress/CMakeLists.txt	Fri Aug 31 18:18:36 2012 +0200
     1.2 +++ b/regress/CMakeLists.txt	Fri Aug 31 21:47:59 2012 +0200
     1.3 @@ -1,10 +1,17 @@
     1.4  ENABLE_TESTING()
     1.5  
     1.6 +CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
     1.7 +IF(NOT HAVE_GETOPT)
     1.8 +  SET(SRC_EXTRA_FILES ../src/getopt.c)
     1.9 +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
    1.10 +  ${CMAKE_CURRENT_SOURCE_DIR}/../src)
    1.11 +ENDIF(NOT HAVE_GETOPT)
    1.12 +
    1.13  SET(STANDALONE_TEST_PROGRAMS
    1.14    add_from_buffer
    1.15    add_from_filep
    1.16    fopen_unchanged
    1.17 -  fread
    1.18 +#  fread
    1.19    name_locate
    1.20    set_comment_all
    1.21    set_comment_localonly
    1.22 @@ -13,8 +20,15 @@
    1.23  )
    1.24  
    1.25  SET(HELPER_TEST_PROGRAMS
    1.26 +#  modify
    1.27 +  set_compression
    1.28 +#  stat_index
    1.29 +#  tryopen
    1.30 +)
    1.31 +
    1.32 +SET(GETOPT_USERS
    1.33 +  fread
    1.34    modify
    1.35 -  set_compression
    1.36    stat_index
    1.37    tryopen
    1.38  )
    1.39 @@ -75,6 +89,12 @@
    1.40    TARGET_LINK_LIBRARIES(${PROGRAM} zip)
    1.41  ENDFOREACH(PROGRAM ${HELPER_TEST_PROGRAMS})
    1.42  
    1.43 +FOREACH(PROGRAM ${GETOPT_USERS})
    1.44 +  ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.c ${SRC_EXTRA_FILES})
    1.45 +  TARGET_LINK_LIBRARIES(${PROGRAM} zip)
    1.46 +ENDFOREACH(PROGRAM ${GETOPT_USERS})
    1.47 +ADD_TEST(fread ${CMAKE_CURRENT_SOURCE_DIR}/runtest ${CMAKE_CURRENT_SOURCE_DIR}/fread)
    1.48 +
    1.49  FOREACH(CASE ${EXTRA_TESTS})
    1.50    ADD_TEST(${CASE} ${CMAKE_CURRENT_SOURCE_DIR}/runtest ${CMAKE_CURRENT_SOURCE_DIR}/${CASE})
    1.51  ENDFOREACH(CASE ${EXTRA_TESTS})