mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 00:28:48 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
122 lines
3.4 KiB
CMake
122 lines
3.4 KiB
CMake
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)
|
|
|
|
include_directories(
|
|
${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
|
|
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
|
|
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
|
|
)
|
|
if(CURL_USE_ARES)
|
|
include_directories(${CARES_INCLUDE_DIR})
|
|
endif()
|
|
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}")
|
|
|
|
# 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()
|
|
|
|
endfunction()
|
|
|
|
|
|
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()
|
|
|
|
|
|
# # files used only in some libcurl test programs
|
|
# SET(TESTUTIL testutil.c testutil.h)
|
|
|
|
# # these files are used in every single test program below
|
|
# SET(SUPPORTFILES first.c test.h)
|
|
|
|
# # 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
|
|
# lib560
|
|
# )
|
|
|
|
# SET(noinst_PROGRAMS_USE_TESTUTIL
|
|
# 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()
|
|
# 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})
|
|
# ENDFOREACH()
|
|
|
|
# # Special cases
|
|
# SET(TEST_NAME lib527)
|
|
# SET(SOURCE "lib526.c" ${SUPPORTFILES})
|
|
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
|
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
|
|
|
# SET(TEST_NAME lib529)
|
|
# SET(SOURCE "lib525.c" ${SUPPORTFILES})
|
|
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
|
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
|
|
|
# SET(TEST_NAME lib532)
|
|
# SET(SOURCE "lib526.c" ${SUPPORTFILES})
|
|
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
|
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
|
|
|
# SET(TEST_NAME lib545)
|
|
# SET(SOURCE "lib544.c" ${SUPPORTFILES})
|
|
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
|
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|
|
|
|
# SET(TEST_NAME lib548)
|
|
# SET(SOURCE "lib547.c" ${SUPPORTFILES})
|
|
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
|
|
# SETUP_TEST(${TEST_NAME} ${SOURCE})
|