Commit 020955eb authored by Benoit Neil's avatar Benoit Neil
Browse files

Added special define for tests that directly include libcurl sources.

parent 3733fa02

include/curl/curl.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */

tests/server/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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}")