mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04: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.
72 lines
2.6 KiB
CMake
72 lines
2.6 KiB
CMake
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)
|
|
|
|
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()
|
|
# resolve test needs this
|
|
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}")
|
|
|
|
# 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(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)
|
|
|