Commit 744dceaf authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: lower case cmake functions and remove tabs and re-indent cmake code

parent 8740d147

CMake/CheckTypeSize.cmake

+48 −48
Original line number Diff line number Diff line
@@ -6,51 +6,51 @@ 
#  VARIABLE - variable to store size if the type exists.

#  HAVE_${VARIABLE} - does the variable exists or not



MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)

  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)

  IF(NOT DEFINED ${VARIABLE})

  IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

    SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")

    SET(MACRO_CHECK_TYPE_SIZE_FLAGS 

macro(CHECK_TYPE_SIZE TYPE VARIABLE)

  set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)

  if(NOT DEFINED ${VARIABLE})

    if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

      set(CHECK_TYPE_SIZE_TYPE "${TYPE}")

      set(MACRO_CHECK_TYPE_SIZE_FLAGS 

        "${CMAKE_REQUIRED_FLAGS}")

    FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)

      IF("${def}")

        SET(MACRO_CHECK_TYPE_SIZE_FLAGS 

      foreach(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)

        if("${def}")

          set(MACRO_CHECK_TYPE_SIZE_FLAGS 

            "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")

      ENDIF("${def}")

    ENDFOREACH(def)

    SET(CHECK_TYPE_SIZE_PREMAIN)

    FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})

      SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")

    ENDFOREACH(def)

    CONFIGURE_FILE(

        endif("${def}")

      endforeach(def)

      set(CHECK_TYPE_SIZE_PREMAIN)

      foreach(def ${CMAKE_EXTRA_INCLUDE_FILES})

        set(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")

      endforeach(def)

      configure_file(

        "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in"

        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" 

        IMMEDIATE @ONLY)

    FILE(READ 

      file(READ 

        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"

        CHECK_TYPE_SIZE_FILE_CONTENT)

    MESSAGE(STATUS "Check size of ${TYPE}")

    IF(CMAKE_REQUIRED_LIBRARIES)

      SET(CHECK_TYPE_SIZE_ADD_LIBRARIES 

      message(STATUS "Check size of ${TYPE}")

      if(CMAKE_REQUIRED_LIBRARIES)

        set(CHECK_TYPE_SIZE_ADD_LIBRARIES 

          "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")

    ENDIF(CMAKE_REQUIRED_LIBRARIES)

    TRY_RUN(${VARIABLE} HAVE_${VARIABLE}

      endif(CMAKE_REQUIRED_LIBRARIES)

      try_run(${VARIABLE} HAVE_${VARIABLE}

        ${CMAKE_BINARY_DIR}

        "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"

        CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}

        "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"

        OUTPUT_VARIABLE OUTPUT)

    IF(HAVE_${VARIABLE})

      MESSAGE(STATUS "Check size of ${TYPE} - done")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 

      if(HAVE_${VARIABLE})

        message(STATUS "Check size of ${TYPE} - done")

        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 

          "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n")

    ELSE(HAVE_${VARIABLE})

      MESSAGE(STATUS "Check size of ${TYPE} - failed")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 

      else(HAVE_${VARIABLE})

        message(STATUS "Check size of ${TYPE} - failed")

        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 

          "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n")

    ENDIF(HAVE_${VARIABLE})

  ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

  ENDIF(NOT DEFINED ${VARIABLE})

  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )

ENDMACRO(CHECK_TYPE_SIZE)
 
      endif(HAVE_${VARIABLE})

    endif("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")

  endif(NOT DEFINED ${VARIABLE})

  set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )

endmacro(CHECK_TYPE_SIZE)

CMake/CurlCheckCSourceCompiles.cmake

+40 −40
Original line number Diff line number Diff line
@@ -12,43 +12,43 @@ 
#  CMAKE_REQUIRED_INCLUDES = list of include directories

#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link



MACRO(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR)

  IF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

    SET(message "${VAR}")

macro(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR)

  if("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

    set(message "${VAR}")

    # If the number of arguments is greater than 2 (SOURCE VAR)

    IF(${ARGC} GREATER 2)

    if(${ARGC} GREATER 2)

      # then add the third argument as a message

      SET(message "${ARGV2} (${VAR})")

    ENDIF(${ARGC} GREATER 2)

    SET(MACRO_CHECK_FUNCTION_DEFINITIONS

      set(message "${ARGV2} (${VAR})")

    endif(${ARGC} GREATER 2)

    set(MACRO_CHECK_FUNCTION_DEFINITIONS

      "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")

    IF(CMAKE_REQUIRED_LIBRARIES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES

    if(CMAKE_REQUIRED_LIBRARIES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES

        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")

    ELSE(CMAKE_REQUIRED_LIBRARIES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)

    ENDIF(CMAKE_REQUIRED_LIBRARIES)

    IF(CMAKE_REQUIRED_INCLUDES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES

    else(CMAKE_REQUIRED_LIBRARIES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)

    endif(CMAKE_REQUIRED_LIBRARIES)

    if(CMAKE_REQUIRED_INCLUDES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES

        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")

    ELSE(CMAKE_REQUIRED_INCLUDES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)

    ENDIF(CMAKE_REQUIRED_INCLUDES)

    SET(src "")

    FOREACH(def ${EXTRA_DEFINES})

      SET(src "${src}#define ${def} 1\n")

    ENDFOREACH(def)

    FOREACH(inc ${HEADER_INCLUDES})

      SET(src "${src}#include <${inc}>\n")

    ENDFOREACH(inc)

    else(CMAKE_REQUIRED_INCLUDES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)

    endif(CMAKE_REQUIRED_INCLUDES)

    set(src "")

    foreach(def ${EXTRA_DEFINES})

      set(src "${src}#define ${def} 1\n")

    endforeach(def)

    foreach(inc ${HEADER_INCLUDES})

      set(src "${src}#include <${inc}>\n")

    endforeach(inc)



    SET(src "${src}\nint main() { ${SOURCE} ; return 0; }")

    SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}")

    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in

    set(src "${src}\nint main() { ${SOURCE} ; return 0; }")

    set(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}")

    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in

      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c"

      IMMEDIATE)

    MESSAGE(STATUS "Performing Test ${message}")

    TRY_COMPILE(${VAR}

    message(STATUS "Performing Test ${message}")

    try_compile(${VAR}

      ${CMAKE_BINARY_DIR}

      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c

      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
@@ -56,20 +56,20 @@ MACRO(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR) 
      "${CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}"

      "${CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"

      OUTPUT_VARIABLE OUTPUT)

    IF(${VAR})

      SET(${VAR} 1 CACHE INTERNAL "Test ${message}")

      MESSAGE(STATUS "Performing Test ${message} - Success")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

    if(${VAR})

      set(${VAR} 1 CACHE INTERNAL "Test ${message}")

      message(STATUS "Performing Test ${message} - Success")

      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

        "Performing C SOURCE FILE Test ${message} succeded with the following output:\n"

        "${OUTPUT}\n"

        "Source file was:\n${src}\n")

    ELSE(${VAR})

      MESSAGE(STATUS "Performing Test ${message} - Failed")

      SET(${VAR} "" CACHE INTERNAL "Test ${message}")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log

    else(${VAR})

      message(STATUS "Performing Test ${message} - Failed")

      set(${VAR} "" CACHE INTERNAL "Test ${message}")

      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log

        "Performing C SOURCE FILE Test ${message} failed with the following output:\n"

        "${OUTPUT}\n"

        "Source file was:\n${src}\n")

    ENDIF(${VAR})

  ENDIF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

ENDMACRO(CURL_CHECK_C_SOURCE_COMPILES)
 
    endif(${VAR})

  endif("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

endmacro(CURL_CHECK_C_SOURCE_COMPILES)

CMake/CurlCheckCSourceRuns.cmake

+44 −44
Original line number Diff line number Diff line
@@ -12,43 +12,43 @@ 
#  CMAKE_REQUIRED_INCLUDES = list of include directories

#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link



MACRO(CURL_CHECK_C_SOURCE_RUNS SOURCE VAR)

  IF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

    SET(message "${VAR}")

macro(CURL_CHECK_C_SOURCE_RUNS SOURCE VAR)

  if("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

    set(message "${VAR}")

    # If the number of arguments is greater than 2 (SOURCE VAR)

    IF(${ARGC} GREATER 2)

    if(${ARGC} GREATER 2)

      # then add the third argument as a message

      SET(message "${ARGV2} (${VAR})")

    ENDIF(${ARGC} GREATER 2)

    SET(MACRO_CHECK_FUNCTION_DEFINITIONS

      set(message "${ARGV2} (${VAR})")

    endif(${ARGC} GREATER 2)

    set(MACRO_CHECK_FUNCTION_DEFINITIONS

      "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")

    IF(CMAKE_REQUIRED_LIBRARIES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES

    if(CMAKE_REQUIRED_LIBRARIES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES

        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")

    ELSE(CMAKE_REQUIRED_LIBRARIES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)

    ENDIF(CMAKE_REQUIRED_LIBRARIES)

    IF(CMAKE_REQUIRED_INCLUDES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES

    else(CMAKE_REQUIRED_LIBRARIES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)

    endif(CMAKE_REQUIRED_LIBRARIES)

    if(CMAKE_REQUIRED_INCLUDES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES

        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")

    ELSE(CMAKE_REQUIRED_INCLUDES)

      SET(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)

    ENDIF(CMAKE_REQUIRED_INCLUDES)

    SET(src "")

    FOREACH(def ${EXTRA_DEFINES})

      SET(src "${src}#define ${def} 1\n")

    ENDFOREACH(def)

    FOREACH(inc ${HEADER_INCLUDES})

      SET(src "${src}#include <${inc}>\n")

    ENDFOREACH(inc)

    else(CMAKE_REQUIRED_INCLUDES)

      set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)

    endif(CMAKE_REQUIRED_INCLUDES)

    set(src "")

    foreach(def ${EXTRA_DEFINES})

      set(src "${src}#define ${def} 1\n")

    endforeach(def)

    foreach(inc ${HEADER_INCLUDES})

      set(src "${src}#include <${inc}>\n")

    endforeach(inc)



    SET(src "${src}\nint main() { ${SOURCE} ; return 0; }")

    SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}")

    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in

    set(src "${src}\nint main() { ${SOURCE} ; return 0; }")

    set(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}")

    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in

      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c"

      IMMEDIATE)

    MESSAGE(STATUS "Performing Test ${message}")

    TRY_RUN(${VAR} ${VAR}_COMPILED

    message(STATUS "Performing Test ${message}")

    try_run(${VAR} ${VAR}_COMPILED

      ${CMAKE_BINARY_DIR}

      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c

      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
@@ -57,27 +57,27 @@ MACRO(CURL_CHECK_C_SOURCE_RUNS SOURCE VAR) 
      "${CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"

      OUTPUT_VARIABLE OUTPUT)

    # if it did not compile make the return value fail code of 1

    IF(NOT ${VAR}_COMPILED)

      SET(${VAR} 1)

    ENDIF(NOT ${VAR}_COMPILED)

    if(NOT ${VAR}_COMPILED)

      set(${VAR} 1)

    endif(NOT ${VAR}_COMPILED)

    # if the return value was 0 then it worked

    SET(result_var ${${VAR}})

    IF("${result_var}" EQUAL 0)

      SET(${VAR} 1 CACHE INTERNAL "Test ${message}")

      MESSAGE(STATUS "Performing Test ${message} - Success")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

    set(result_var ${${VAR}})

    if("${result_var}" EQUAL 0)

      set(${VAR} 1 CACHE INTERNAL "Test ${message}")

      message(STATUS "Performing Test ${message} - Success")

      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log

        "Performing C SOURCE FILE Test ${message} succeded with the following output:\n"

        "${OUTPUT}\n"

        "Return value: ${${VAR}}\n"

        "Source file was:\n${src}\n")

    ELSE("${result_var}" EQUAL 0)

      MESSAGE(STATUS "Performing Test ${message} - Failed")

      SET(${VAR} "" CACHE INTERNAL "Test ${message}")

      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log

    else("${result_var}" EQUAL 0)

      message(STATUS "Performing Test ${message} - Failed")

      set(${VAR} "" CACHE INTERNAL "Test ${message}")

      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log

        "Performing C SOURCE FILE Test ${message} failed with the following output:\n"

        "${OUTPUT}\n"

        "Return value: ${result_var}\n"

        "Source file was:\n${src}\n")

    ENDIF("${result_var}" EQUAL 0)

  ENDIF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

ENDMACRO(CURL_CHECK_C_SOURCE_RUNS)
 
    endif("${result_var}" EQUAL 0)

  endif("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN")

endmacro(CURL_CHECK_C_SOURCE_RUNS)

CMake/FindOpenSSL.cmake

+12 −12
Original line number Diff line number Diff line 
# Extension of the standard FindOpenSSL.cmake

# Adds OPENSSL_INCLUDE_DIRS and libeay32

INCLUDE("${CMAKE_ROOT}/Modules/FindOpenSSL.cmake")

include("${CMAKE_ROOT}/Modules/FindOpenSSL.cmake")



# Bill Hoffman told that libeay32 is necessary for him:

FIND_LIBRARY(SSL_LIBEAY NAMES libeay32)

find_library(SSL_LIBEAY NAMES libeay32)



IF(OPENSSL_FOUND)

	IF(SSL_LIBEAY)

		LIST(APPEND OPENSSL_LIBRARIES ${SSL_LIBEAY})

	ELSE()

		SET(OPENSSL_FOUND FALSE)

	ENDIF()

ENDIF()

if(OPENSSL_FOUND)

  if(SSL_LIBEAY)

    list(APPEND OPENSSL_LIBRARIES ${SSL_LIBEAY})

  else()

    set(OPENSSL_FOUND FALSE)

  endif()

endif()





IF(OPENSSL_FOUND)

	SET(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})

ENDIF()
 
if(OPENSSL_FOUND)

  set(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})

endif()

CMake/FindZLIB.cmake

+5 −5
Original line number Diff line number Diff line 
# Locate zlib

INCLUDE("${CMAKE_ROOT}/Modules/FindZLIB.cmake")

include("${CMAKE_ROOT}/Modules/FindZLIB.cmake")



FIND_LIBRARY(ZLIB_LIBRARY_DEBUG NAMES zd zlibd zdlld zlib1d )

find_library(ZLIB_LIBRARY_DEBUG NAMES zd zlibd zdlld zlib1d )



IF(ZLIB_FOUND AND ZLIB_LIBRARY_DEBUG)

  SET( ZLIB_LIBRARIES optimized "${ZLIB_LIBRARY}" debug ${ZLIB_LIBRARY_DEBUG})

ENDIF()
 
if(ZLIB_FOUND AND ZLIB_LIBRARY_DEBUG)

  set( ZLIB_LIBRARIES optimized "${ZLIB_LIBRARY}" debug ${ZLIB_LIBRARY_DEBUG})

endif()