From 8cb8371011a8920f5b137ba6bec463d37262a393 Mon Sep 17 00:00:00 2001 From: Benoit Neil Date: Mon, 6 Apr 2009 22:45:17 +0000 Subject: Made the CMake scripts read Makefile.inc. Needs testing I guess. --- lib/CMakeLists.txt | 185 +++++++++++------------------------------------------ 1 file changed, 37 insertions(+), 148 deletions(-) (limited to 'lib/CMakeLists.txt') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 7e55c7d79..f166945a1 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -5,110 +5,49 @@ CONFIGURE_FILE(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake CONFIGURE_FILE(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -SET(libCurl_HEADERS + +TRANSFORM_MAKEFILE_INC("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") +INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake) + +LIST(APPEND HHEADERS ${CMAKE_CURRENT_BINARY_DIR}/config.h ${CURL_BINARY_DIR}/include/curl/curlbuild.h - arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h - progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h - if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h - getinfo.h strequal.h krb4.h memdebug.h http_chunks.h - strtok.h connect.h llist.h hash.h content_encoding.h share.h - curl_md5.h http_digest.h http_negotiate.h http_ntlm.h inet_pton.h - strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h - transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h - tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h - curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h -) - -SET(libCurl_SRCS - # amigaos.c - does not build on AmigaOS - base64.c - connect.c - content_encoding.c - cookie.c - curl_addrinfo.c - curl_sspi.c - dict.c - easy.c - escape.c - file.c - formdata.c - ftp.c - getenv.c - getinfo.c - gtls.c - hash.c - hostares.c - hostasyn.c - hostip4.c - hostip6.c - hostip.c - hostsyn.c - hostthre.c - http.c - http_chunks.c - http_digest.c - http_negotiate.c - http_ntlm.c - if2ip.c - inet_ntop.c - inet_pton.c - krb4.c - ldap.c - llist.c - md5.c -# memdebug.c -not used - mprintf.c - multi.c - netrc.c - # nwlib.c - Not used - parsedate.c - progress.c - rawstr.c - security.c - select.c - sendf.c - slist.c - share.c - socks.c - speedcheck.c - splay.c - ssh.c - sslgen.c - ssluse.c - strdup.c - strequal.c - strerror.c - # strtok.c - specify later - # strtoofft.c - specify later - telnet.c - tftp.c - timeval.c - transfer.c - url.c - version.c ) IF(MSVC) - LIST(APPEND libCurl_SRCS libcurl.rc) + LIST(APPEND CSOURCES libcurl.rc) ENDIF() -# if we have Kerberos 4, right now this is never on -#OPTION(CURL_KRB4 "Use Kerberos 4" OFF) -IF(CURL_KRB4) - SET(libCurl_SRCS ${libCurl_SRCS} - krb4.c - security.c - ) -ENDIF(CURL_KRB4) - -#OPTION(CURL_MALLOC_DEBUG "Debug mallocs in Curl" OFF) -MARK_AS_ADVANCED(CURL_MALLOC_DEBUG) -IF(CURL_MALLOC_DEBUG) - SET(libCurl_SRCS ${libCurl_SRCS} - memdebug.c - ) -ENDIF(CURL_MALLOC_DEBUG) +# SET(CSOURCES + # # memdebug.c -not used + # # nwlib.c - Not used + # # strtok.c - specify later + # # strtoofft.c - specify later +# ) + +# # if we have Kerberos 4, right now this is never on +# #OPTION(CURL_KRB4 "Use Kerberos 4" OFF) +# IF(CURL_KRB4) + # SET(CSOURCES ${CSOURCES} + # krb4.c + # security.c + # ) +# ENDIF(CURL_KRB4) + +# #OPTION(CURL_MALLOC_DEBUG "Debug mallocs in Curl" OFF) +# MARK_AS_ADVANCED(CURL_MALLOC_DEBUG) +# IF(CURL_MALLOC_DEBUG) + # SET(CSOURCES ${CSOURCES} + # memdebug.c + # ) +# ENDIF(CURL_MALLOC_DEBUG) + +# # only build compat strtoofft if we need to +# IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) + # SET(CSOURCES ${CSOURCES} + # strtoofft.c + # ) +# ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) IF(HAVE_FEATURES_H) SET_SOURCE_FILES_PROPERTIES( @@ -128,56 +67,6 @@ IF(HAVE_FEATURES_H) COMPILE_FLAGS -D_BSD_SOURCE) ENDIF(HAVE_FEATURES_H) -#strtoll \ -#socket \ -#select \ -#strdup \ -#strstr \ -#strtok_r \ -#uname \ -#strcasecmp \ -#stricmp \ -#strcmpi \ -#gethostbyaddr \ -#gettimeofday \ -#inet_addr \ -#inet_ntoa \ -#inet_pton \ -#perror \ -#closesocket \ -#siginterrupt \ -#sigaction \ -#signal \ -#getpass_r \ -#strlcat \ -#getpwuid \ -#geteuid \ -#dlopen \ -#utime \ -#sigsetjmp \ -#basename \ -#setlocale \ -#ftruncate \ -#pipe \ -#poll \ -#getprotobyname \ -#getrlimit \ -#setrlimit \ -#fork - -# only build compat strtok if we need to -IF (NOT HAVE_STRTOK_R) - SET(libCurl_SRCS ${libCurl_SRCS} - strtok.c - ) -ENDIF (NOT HAVE_STRTOK_R) - -# only build compat strtoofft if we need to -IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) - SET(libCurl_SRCS ${libCurl_SRCS} - strtoofft.c - ) -ENDIF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) # The rest of the build @@ -199,7 +88,7 @@ ENDIF() ADD_LIBRARY( ${LIB_NAME} ${CURL_USER_DEFINED_DYNAMIC_OR_STATIC} - ${libCurl_HEADERS} ${libCurl_SRCS} + ${HHEADERS} ${CSOURCES} ) TARGET_LINK_LIBRARIES(${LIB_NAME} ${CURL_LIBS}) -- cgit v1.2.3