From 020955ebc26ec978fe7ebac380519d877f0c3f79 Mon Sep 17 00:00:00 2001
From: Benoit Neil <suky0001@free.fr>
Date: Wed, 8 Apr 2009 23:35:09 +0000
Subject: [PATCH] Added special define for tests that directly include libcurl
sources.
---
include/curl/curl.h | 5 +++++
tests/server/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 7ecb6317b1..30763700d9 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -93,6 +93,10 @@ extern "C" {
typedef void CURL;
+#ifdef USES_DIRECT_CURL_UTILITIES
+#define CURL_EXTERN
+#else /* USES_DIRECT_CURL_UTILITIES */
+
/*
* Decorate exportable functions for Win32 and Symbian OS DLL linking.
* This avoids using a .def file for building libcurl.dll.
@@ -118,6 +122,7 @@ typedef void CURL;
#define CURL_EXTERN
#endif
#endif
+#endif /* USES_DIRECT_CURL_UTILITIES */
#ifndef curl_socket_typedef
/* socket typedef */
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index c464a1f454..eaaef0dce6 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -12,7 +12,7 @@ FUNCTION(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
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 COMPILE_DEFINITIONS USES_DIRECT_CURL_UTILITIES) # ${UPPER_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}")
--
GitLab