mirror of
https://github.com/curl/curl.git
synced 2026-06-07 10:54:17 +03:00
tests: move CURL_DISABLE_DEPRECATION from build to first.h
This commit is contained in:
parent
96dcf33704
commit
795b2431cb
7 changed files with 5 additions and 6 deletions
|
|
@ -55,7 +55,7 @@ target_include_directories(${BUNDLE} PRIVATE
|
|||
"${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h", curlx
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}" # for the generated bundle source to find included test sources
|
||||
)
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS} "CURL_DISABLE_DEPRECATION")
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS})
|
||||
set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
|
||||
|
||||
curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${UTILS_C} ${TESTS_C})
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ endif
|
|||
if CURLDEBUG
|
||||
AM_CPPFLAGS += -DCURLDEBUG
|
||||
endif
|
||||
AM_CPPFLAGS += -DCURL_DISABLE_DEPRECATION
|
||||
|
||||
if USE_CPPFLAG_CURL_STATICLIB
|
||||
curlx_c_lib =
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
*
|
||||
***************************************************************************/
|
||||
#define CURL_NO_OLDIES
|
||||
#define CURL_DISABLE_DEPRECATION
|
||||
|
||||
/* Now include the curl_setup.h file from libcurl's private libdir (the source
|
||||
version, but that might include "curl_config.h" from the build dir so we
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ target_include_directories(${BUNDLE} PRIVATE
|
|||
"${PROJECT_SOURCE_DIR}/tests/libtest" # for "first.h", "unitcheck.h"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}" # for the generated bundle source to find included test sources
|
||||
)
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS} "CURL_DISABLE_DEPRECATION")
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS})
|
||||
set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
|
||||
|
||||
curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ endif
|
|||
if CURLDEBUG
|
||||
AM_CPPFLAGS += -DCURLDEBUG
|
||||
endif
|
||||
AM_CPPFLAGS += -DCURL_DISABLE_DEPRECATION
|
||||
|
||||
if BUILD_UNITTESTS
|
||||
$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ target_include_directories(${BUNDLE} PRIVATE
|
|||
"${CMAKE_CURRENT_SOURCE_DIR}" # for the generated bundle source to find included test sources
|
||||
)
|
||||
# unit tests are small pretend-libcurl-programs, pass BUILDING_LIBCURL to reflect that
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS} "CURL_DISABLE_DEPRECATION" "BUILDING_LIBCURL")
|
||||
target_compile_definitions(${BUNDLE} PRIVATE ${CURL_DEBUG_MACROS} "BUILDING_LIBCURL")
|
||||
set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "")
|
||||
|
||||
curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C})
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ if CURLDEBUG
|
|||
AM_CPPFLAGS += -DCURLDEBUG
|
||||
endif
|
||||
# unit tests are small pretend-libcurl-programs, pass BUILDING_LIBCURL to reflect that
|
||||
AM_CPPFLAGS += -DCURL_DISABLE_DEPRECATION -DBUILDING_LIBCURL
|
||||
AM_CPPFLAGS += -DBUILDING_LIBCURL
|
||||
|
||||
if BUILD_UNITTESTS
|
||||
$(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(TESTS_C)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue