mirror of
https://github.com/curl/curl.git
synced 2026-07-23 17:37:17 +03:00
ENH: lower case cmake functions and remove tabs and re-indent cmake code
This commit is contained in:
Bill Hoffman
parent
8740d147c9
commit
744dceaffe
14 changed files with 1197 additions and 1187 deletions
|
|
@ -1,2 +1,2 @@
|
|||
ADD_SUBDIRECTORY(libtest)
|
||||
ADD_SUBDIRECTORY(server)
|
||||
add_subdirectory(libtest)
|
||||
add_subdirectory(server)
|
||||
|
|
|
|||
|
|
@ -1,41 +1,45 @@
|
|||
SET(TARGET_LABEL_PREFIX "Test ")
|
||||
set(TARGET_LABEL_PREFIX "Test ")
|
||||
|
||||
FUNCTION(SETUP_TEST TEST_NAME) # ARGN are the files in the test
|
||||
ADD_EXECUTABLE( ${TEST_NAME} ${ARGN} )
|
||||
STRING(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
|
||||
function(SETUP_TEST 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 )
|
||||
|
||||
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME})
|
||||
SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}")
|
||||
set_target_properties(${TEST_NAME}
|
||||
PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME})
|
||||
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(TEST_NAME ${noinst_PROGRAMS})
|
||||
SETUP_TEST(${TEST_NAME} ${${TEST_NAME}_SOURCES})
|
||||
ENDFOREACH()
|
||||
foreach(TEST_NAME ${noinst_PROGRAMS})
|
||||
setup_test(${TEST_NAME} ${${TEST_NAME}_SOURCES})
|
||||
endforeach()
|
||||
|
||||
|
||||
# # files used only in some libcurl test programs
|
||||
|
|
@ -46,47 +50,47 @@ ENDFOREACH()
|
|||
|
||||
# # These are all libcurl test programs
|
||||
# SET(noinst_PROGRAMS
|
||||
# lib500 lib501 lib502 lib503 lib504 lib505 lib506
|
||||
# lib507 lib508 lib510 lib511 lib512 lib513 lib514 lib515 lib516
|
||||
# lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526
|
||||
# #lib527
|
||||
# #lib529
|
||||
# lib530
|
||||
# #lib532
|
||||
# lib533 lib536 lib537 lib540 lib541 lib542 lib543
|
||||
# lib544
|
||||
# #lib545
|
||||
# lib547
|
||||
# #lib548
|
||||
# lib549 lib552 lib553 lib554 lib555 lib556
|
||||
# lib539 lib557 lib558
|
||||
# #lib559
|
||||
# lib560
|
||||
# lib500 lib501 lib502 lib503 lib504 lib505 lib506
|
||||
# lib507 lib508 lib510 lib511 lib512 lib513 lib514 lib515 lib516
|
||||
# lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526
|
||||
# #lib527
|
||||
# #lib529
|
||||
# lib530
|
||||
# #lib532
|
||||
# lib533 lib536 lib537 lib540 lib541 lib542 lib543
|
||||
# lib544
|
||||
# #lib545
|
||||
# lib547
|
||||
# #lib548
|
||||
# lib549 lib552 lib553 lib554 lib555 lib556
|
||||
# lib539 lib557 lib558
|
||||
# #lib559
|
||||
# lib560
|
||||
# )
|
||||
|
||||
# SET(noinst_PROGRAMS_USE_TESTUTIL
|
||||
# lib502 lib503 lib504
|
||||
# lib507
|
||||
# lib525 lib526 lib527
|
||||
# lib529
|
||||
# lib530
|
||||
# lib532
|
||||
# lib533 lib536
|
||||
# lib555
|
||||
# lib502 lib503 lib504
|
||||
# lib507
|
||||
# lib525 lib526 lib527
|
||||
# lib529
|
||||
# lib530
|
||||
# lib532
|
||||
# lib533 lib536
|
||||
# lib555
|
||||
# )
|
||||
|
||||
# MACRO(ADD_TESTUTIL_IF_NECESSARY TEST_NAME)
|
||||
# LIST(FIND noinst_PROGRAMS_USE_TESTUTIL ${TEST_NAME} USES_TESTUTIL)
|
||||
# IF(NOT ${USES_TESTUTIL} EQUAL -1)
|
||||
# LIST(APPEND SOURCE ${TESTUTIL}) # Need TestUtil
|
||||
# ENDIF()
|
||||
# LIST(FIND noinst_PROGRAMS_USE_TESTUTIL ${TEST_NAME} USES_TESTUTIL)
|
||||
# IF(NOT ${USES_TESTUTIL} EQUAL -1)
|
||||
# LIST(APPEND SOURCE ${TESTUTIL}) # Need TestUtil
|
||||
# ENDIF()
|
||||
# ENDMACRO()
|
||||
|
||||
# # General case
|
||||
# FOREACH(TEST_NAME ${noinst_PROGRAMS})
|
||||
# SET(SOURCE "${TEST_NAME}.c" ${SUPPORTFILES})
|
||||
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
||||
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
||||
# SET(SOURCE "${TEST_NAME}.c" ${SUPPORTFILES})
|
||||
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
||||
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
||||
# ENDFOREACH()
|
||||
|
||||
# # Special cases
|
||||
|
|
|
|||
|
|
@ -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})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue