From e9dd0998706a0ce099826b982bbb1671909fe026 Mon Sep 17 00:00:00 2001 From: Benoit Neil Date: Tue, 7 Apr 2009 21:59:15 +0000 Subject: Added missing tests in CMake, added Makefile.inc for tests (+ use in CMake scripts), and fixed a missing define under windows in a test source file. --- tests/server/CMakeLists.txt | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'tests/server/CMakeLists.txt') diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 0df7e16db..2968a218b 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -27,19 +27,26 @@ MACRO(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test ENDMACRO() - -SET(useful - getpart.c getpart.h - ${CURL_SOURCE_DIR}/lib/strequal.c - ${CURL_SOURCE_DIR}/lib/base64.c - ${CURL_SOURCE_DIR}/lib/mprintf.c - ${CURL_SOURCE_DIR}/lib/memdebug.c - ${CURL_SOURCE_DIR}/lib/timeval.c -) - -SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful}) -SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful}) -SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) -SETUP_EXECUTABLE(getpart testpart.c ${useful}) -SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h) +TRANSFORM_MAKEFILE_INC("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") +INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) + +FOREACH(EXECUTABLE_NAME ${noinst_PROGRAMS}) + SETUP_EXECUTABLE(${EXECUTABLE_NAME} ${${EXECUTABLE_NAME}_SOURCES}) +ENDFOREACH() + + +# SET(useful + # getpart.c getpart.h + # ${CURL_SOURCE_DIR}/lib/strequal.c + # ${CURL_SOURCE_DIR}/lib/base64.c + # ${CURL_SOURCE_DIR}/lib/mprintf.c + # ${CURL_SOURCE_DIR}/lib/memdebug.c + # ${CURL_SOURCE_DIR}/lib/timeval.c +# ) + +# SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful}) +# SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful}) +# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) +# SETUP_EXECUTABLE(getpart testpart.c ${useful}) +# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h) -- cgit v1.2.3