Commit 4d396169 authored by Benoit Neil's avatar Benoit Neil
Browse files

Cleaned up the custom definition I added (replaced by CURL_STATICLIB)

parent 4cd95090

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
# cURL/libcurl CMake script

# by [PUT YOUR REAL NAME TETEST!] and Sukender (Benoit Neil)

# by Tetetest and Sukender (Benoit Neil)



# TODO:

# The output .so file lacks the soname number which we currently have within the lib/Makefile.am file
@@ -141,7 +141,6 @@ MARK_AS_ADVANCED(DISABLED_THREADSAFE) 
OPTION(ENABLE_IPV6 "Define if you want to enable IPv6 support" OFF)

MARK_AS_ADVANCED(ENABLE_IPV6)





IF(WIN32)

  LIST_SPACES_APPEND_ONCE(CMAKE_C_STANDARD_LIBRARIES wsock32.lib ws2_32.lib)  # bufferoverflowu.lib

  IF(CURL_DISABLE_LDAP)

include/curl/curl.h

+0 −5
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ 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.
@@ -122,7 +118,6 @@ typedef void CURL; 
#define CURL_EXTERN

#endif

#endif

#endif /* USES_DIRECT_CURL_UTILITIES */



#ifndef curl_socket_typedef

/* socket typedef */

lib/config.h.cmake

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 


/* to make a symbol visible */

#cmakedefine CURL_EXTERN_SYMBOL ${CURL_EXTERN_SYMBOL}

/* Ensure using CURL_EXTERN_SYMBOL is possible */

#ifndef CURL_EXTERN_SYMBOL

#define CURL_EXTERN_SYMBOL

#endif



/* to enable hidden symbols */

#cmakedefine CURL_HIDDEN_SYMBOLS ${CURL_HIDDEN_SYMBOLS}

tests/server/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ 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 USES_DIRECT_CURL_UTILITIES)	# ${UPPER_TEST_NAME}

	# Here we define CURL_STATICLIB if not already done. This is a hacky way to avoid symbols from libcrul to be exported/imported, since we do NOT link against libcurl, but include directly some source files.

	# Please note this is specific to those tests.

	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