Commit d42f9329 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

Fix curl CMake build. 

This commit fixes the cmake build of curl, and cleans up the
cmake code a little.  It removes some commented out code and
some trailing whitespace.  To get curl to build the binary
tree include/curl directory needed to be added to the include
path. Also, SIZEOF_SHORT needed to be added.  A check for the
lack of defines of SIZEOF_* for warnless.c was added.
parent 9828b926

CMakeLists.txt

+28 −62
Original line number Diff line number Diff line
@@ -55,10 +55,7 @@ message(STATUS "curl version=[${CURL_VERSION}]") 
set(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}")

set(OS "\"${CMAKE_SYSTEM_NAME}\"")



# Make the base headers visible to everything

# IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})

# INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)

# ENDIF()

include_directories(${PROJECT_BINARY_DIR}/include/curl)

include_directories( ${CURL_SOURCE_DIR}/include )



if(WIN32)
@@ -216,7 +213,6 @@ endmacro(CHECK_LIBRARY_EXISTS_CONCAT) 


# Check for all needed libraries

check_library_exists_concat("dl"     dlopen       HAVE_LIBDL)

#CHECK_LIBRARY_EXISTS_CONCAT("ucb"    gethostname  HAVE_LIBUCB)

check_library_exists_concat("socket" connect      HAVE_LIBSOCKET)

check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL)
@@ -248,9 +244,10 @@ if(CMAKE_USE_OPENSSL) 
      set(USE_SSLEAY TRUE)

      set(USE_OPENSSL TRUE)

      list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES} )

    else()

      set(CMAKE_USE_OPENSSL FALSE)

      message(STATUS "OpenSSL NOT Found, disabling CMAKE_USE_OPENSSL")

    endif()

    #FIND_LIBRARY(LIBEAY NAMES libeay32)

    #LIST(APPEND CURL_LIBS ${LIBEAY} )

  else(WIN32)

    check_library_exists_concat("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)

    check_library_exists_concat("ssl"    SSL_connect  HAVE_LIBSSL)
@@ -400,6 +397,7 @@ check_type_size(size_t SIZEOF_SIZE_T) 
check_type_size(ssize_t  SIZEOF_SSIZE_T)

check_type_size("long long"  SIZEOF_LONG_LONG)

check_type_size("long"  SIZEOF_LONG)

check_type_size("short"  SIZEOF_SHORT)

check_type_size("int"  SIZEOF_INT)

check_type_size("__int64"  SIZEOF___INT64)

check_type_size("long double"  SIZEOF_LONG_DOUBLE)
@@ -836,38 +834,6 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) 
  string(REGEX REPLACE "@([a-zA-Z_][a-zA-Z0-9_]*)@" "\${\\1}" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})    # Replace @@ with ${}, even if that may not be read by CMake scripts.

  file(WRITE ${OUTPUT_FILE} ${MAKEFILE_INC_TEXT})



  ### BUGGY METHOD 1

  # FILE(STRINGS Makefile.inc MAKEFILE_INC_TEXT)

  # STRING(REPLACE "# ./lib/Makefile.inc" "" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # STRING(REPLACE "  " " " MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})    # Replace tabs with spaces



  # #STRING(REGEX MATCH "CSOURCES *=" AAA ${MAKEFILE_INC_TEXT})

  # #MESSAGE(STATUS ${AAA})



  # STRING(REPLACE "CSOURCES =" "" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # STRING(REPLACE "HHEADERS =" "" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})



  # STRING(REGEX REPLACE "[^ ]+\\.c" "" ${HEADERS_VAR} ${MAKEFILE_INC_TEXT})    # Remove source files and store into headers var

  # STRING(REGEX REPLACE "  +" " " ${HEADERS_VAR} ${${HEADERS_VAR}})

  # STRING(REGEX REPLACE " " ";" ${HEADERS_VAR} ${${HEADERS_VAR}})



  # STRING(REGEX REPLACE "[^ ]+\\.h" "" ${SOURCES_VAR} ${MAKEFILE_INC_TEXT})    # Remove headers and store into source files var

  # STRING(REGEX REPLACE "  +" " " ${SOURCES_VAR} ${${SOURCES_VAR}})

  # STRING(REGEX REPLACE " " ";" ${SOURCES_VAR} ${${SOURCES_VAR}})



  # SET(${HEADERS_VAR} ${${HEADERS_VAR}} PARENT_SCOPE)

  # SET(${SOURCES_VAR} ${${SOURCES_VAR}} PARENT_SCOPE)



  ### BUGGY METHOD 2

  # FILE(READ Makefile.inc MAKEFILE_INC_TEXT)

  # #STRING(REPLACE "\t" " " MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})    # Replace tabs with spaces

  # #STRING(REGEX REPLACE "\n+" "\n" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})    # Remove empty lines (allow a simplification in the script)

  # STRING(REGEX REPLACE "([A-Z]+)[\t ]*=[\t ]*" "SET(\\1 " MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # #STRING(REGEX REPLACE "^(.*)[\t ]*[^\\]$" ")" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # STRING(REGEX REPLACE "([^\\])\n" "\\1)\n" MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # # STRING(REGEX REPLACE "CSOURCES *=" "SET(libCurl_SRCS " MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # # STRING(REGEX REPLACE "HHEADERS *=" "SET(libCurl_HEADERS " MAKEFILE_INC_TEXT ${MAKEFILE_INC_TEXT})

  # FILE(WRITE Makefile.inc.cmake ${MAKEFILE_INC_TEXT})

endfunction()



add_subdirectory(lib)

lib/curl_config.h.cmake

+3 −0
Original line number Diff line number Diff line
@@ -853,6 +853,9 @@ 
/* The size of `int', as computed by sizeof. */

#cmakedefine SIZEOF_INT ${SIZEOF_INT}



/* The size of `short', as computed by sizeof. */

#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT}



/* The size of `long', as computed by sizeof. */

#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}

lib/warnless.c

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#elif (SIZEOF_SHORT == 8)

#  define CURL_MASK_SSHORT  0x7FFFFFFFFFFFFFFF

#  define CURL_MASK_USHORT  0xFFFFFFFFFFFFFFFF

#else

# error "SIZEOF_SHORT not defined"

#endif



#if (SIZEOF_INT == 2)
@@ -50,6 +52,8 @@ 
#elif (SIZEOF_INT == 16)

#  define CURL_MASK_SINT  0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

#  define CURL_MASK_UINT  0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

#else

# error "SIZEOF_INT not defined"

#endif



#if (CURL_SIZEOF_LONG == 2)
@@ -64,6 +68,8 @@ 
#elif (SIZEOF_LONG == 16)

#  define CURL_MASK_SLONG  0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL

#  define CURL_MASK_ULONG  0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFUL

#else

# error "SIZEOF_LONG not defined"

#endif



/*