From 744dceaffe4f79293b6bdd9eefe64ca83c701876 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 9 Jun 2009 17:29:16 +0000 Subject: ENH: lower case cmake functions and remove tabs and re-indent cmake code --- tests/server/CMakeLists.txt | 89 ++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 42 deletions(-) (limited to 'tests/server/CMakeLists.txt') diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index e094301fa..c9b32e16f 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -1,58 +1,63 @@ -SET(TARGET_LABEL_PREFIX "Test server ") +set(TARGET_LABEL_PREFIX "Test server ") -FUNCTION(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test - ADD_EXECUTABLE( ${TEST_NAME} ${ARGN} ) - STRING(TOUPPER ${TEST_NAME} UPPER_TEST_NAME) +function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test + add_executable( ${TEST_NAME} ${ARGN} ) + string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME) - INCLUDE_DIRECTORIES( - ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" - ${CURL_BINARY_DIR}/lib # To be able to reach "config.h" - ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" - ) + include_directories( + ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" + ${CURL_BINARY_DIR}/lib # To be able to reach "config.h" + ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" + ) - SETUP_CURL_DEPENDENCIES(${TEST_NAME}) - #TARGET_LINK_LIBRARIES( ${TEST_NAME} libcurl ) + setup_curl_dependencies(${TEST_NAME}) + #TARGET_LINK_LIBRARIES( ${TEST_NAME} libcurl ) - # Test servers simply are standalone programs that do not use libcurl - # library. For convinience and to ease portability of these servers, - # some source code files from the libcurl subdirectory are also used - # to build the servers. In order to achieve proper linkage of these - # files on Win32 targets it is necessary to build the test servers - # with CURL_STATICLIB defined, independently of how libcurl is built. - IF(NOT CURL_STATICLIB) - SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS CURL_STATICLIB) # ${UPPER_TEST_NAME} - ENDIF() - SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") + # Test servers simply are standalone programs that do not use libcurl + # library. For convinience and to ease portability of these servers, + # some source code files from the libcurl subdirectory are also used + # to build the servers. In order to achieve proper linkage of these + # files on Win32 targets it is necessary to build the test servers + # with CURL_STATICLIB defined, independently of how libcurl is built. + if(NOT CURL_STATICLIB) + set_target_properties(${TEST_NAME} PROPERTIES + COMPILE_DEFINITIONS CURL_STATICLIB) # ${UPPER_TEST_NAME} + endif() + set_target_properties(${TEST_NAME} PROPERTIES + PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - # Add the postfix to the executable since it is not added automatically as for modules and shared libraries - SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") + # Add the postfix to the executable since it is not added + # automatically as for modules and shared libraries + set_target_properties(${TEST_NAME} PROPERTIES + DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - IF(MSVC) - IF(NOT BUILD_RELEASE_DEBUG_DIRS) - # Ugly workaround to remove the "/debug" or "/release" in each output - SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES PREFIX "../") - SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES IMPORT_PREFIX "../") - ENDIF() - ENDIF() + if(MSVC) + if(NOT BUILD_RELEASE_DEBUG_DIRS) + # Ugly workaround to remove the "/debug" or "/release" in each output + set_target_properties(${TEST_NAME} PROPERTIES PREFIX "../") + set_target_properties(${TEST_NAME} PROPERTIES IMPORT_PREFIX "../") + endif() + endif() -ENDFUNCTION() +endfunction() -TRANSFORM_MAKEFILE_INC("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") -INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) +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() +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 +# 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}) -- cgit v1.2.3