mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18: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.
59 lines
2.1 KiB
CMake
59 lines
2.1 KiB
CMake
set(EXE_NAME curl)
|
|
|
|
# First try to locate tool_hugehelp.c to see if it has already been created
|
|
# TODO Find the file WITHOUT adding a cache entry!!! Or else the user can delete the file after the script was first run, and the script won't notice it has gone.
|
|
find_file(HUGEHELP_C_FILE tool_hugehelp.c PATHS . NO_DEFAULT_PATH)
|
|
if (NOT HUGEHELP_C_FILE)
|
|
message(STATUS "Warning: tool_hugehelp.c file was not generated before. Generating an 'empty' file...")
|
|
file(WRITE tool_hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"tool_hugehelp.h\"\nvoid hugehelp(void) {}\n\n")
|
|
endif()
|
|
|
|
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
|
|
include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
|
|
|
|
if(MSVC)
|
|
list(APPEND CURL_SOURCE curl.rc)
|
|
endif()
|
|
|
|
add_executable(
|
|
${EXE_NAME}
|
|
${curl_SOURCES}
|
|
)
|
|
|
|
source_group("cURLX source files" FILES ${CURLX_ONES})
|
|
source_group("cURL source files" FILES ${CURL_CFILES})
|
|
source_group("cURL header files" FILES ${CURL_HFILES})
|
|
|
|
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"
|
|
)
|
|
|
|
|
|
# Setup dependencies
|
|
setup_curl_dependencies(${EXE_NAME})
|
|
target_link_libraries( ${EXE_NAME} libcurl )
|
|
|
|
|
|
################################################################################
|
|
|
|
#SET_TARGET_PROPERTIES(${EXE_NAME} ARCHIVE_OUTPUT_DIRECTORY "blah blah blah")
|
|
#SET_TARGET_PROPERTIES(${EXE_NAME} RUNTIME_OUTPUT_DIRECTORY "blah blah blah")
|
|
#SET_TARGET_PROPERTIES(${EXE_NAME} LIBRARY_OUTPUT_DIRECTORY "blah blah blah")
|
|
|
|
# Add the postfix to the executable since it is not added automatically as for modules and shared libraries
|
|
set_target_properties(${EXE_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(${EXE_NAME} PROPERTIES PREFIX "../")
|
|
endif()
|
|
endif()
|
|
|
|
#INCLUDE(ModuleInstall OPTIONAL)
|
|
|
|
install(TARGETS ${EXE_NAME} DESTINATION bin)
|