Unverified Commit d1207c07 authored by Ruslan Baratov's avatar Ruslan Baratov Committed by Daniel Stenberg
Browse files

CMake: Update scripts to use consistent style 

Closes #2727
Reviewed-by: Sergei Nikulov
parent a82372e0

CMake/FindCARES.cmake

+19 −19
Original line number Diff line number Diff line
@@ -7,36 +7,36 @@ 
# also defined, but not for general use are

# CARES_LIBRARY, where to find the c-ares library.



FIND_PATH(CARES_INCLUDE_DIR ares.h

find_path(CARES_INCLUDE_DIR ares.h

  /usr/local/include

  /usr/include

  )



SET(CARES_NAMES ${CARES_NAMES} cares)

FIND_LIBRARY(CARES_LIBRARY

set(CARES_NAMES ${CARES_NAMES} cares)

find_library(CARES_LIBRARY

  NAMES ${CARES_NAMES}

  PATHS /usr/lib /usr/local/lib

  )



IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)

  SET(CARES_LIBRARIES ${CARES_LIBRARY})

  SET(CARES_FOUND "YES")

ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)

  SET(CARES_FOUND "NO")

ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)

if(CARES_LIBRARY AND CARES_INCLUDE_DIR)

  set(CARES_LIBRARIES ${CARES_LIBRARY})

  set(CARES_FOUND "YES")

else()

  set(CARES_FOUND "NO")

endif()





IF (CARES_FOUND)

  IF (NOT CARES_FIND_QUIETLY)

    MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")

  ENDIF (NOT CARES_FIND_QUIETLY)

ELSE (CARES_FOUND)

  IF (CARES_FIND_REQUIRED)

    MESSAGE(FATAL_ERROR "Could not find c-ares library")

  ENDIF (CARES_FIND_REQUIRED)

ENDIF (CARES_FOUND)

if(CARES_FOUND)

  if(NOT CARES_FIND_QUIETLY)

    message(STATUS "Found c-ares: ${CARES_LIBRARIES}")

  endif()

else()

  if(CARES_FIND_REQUIRED)

    message(FATAL_ERROR "Could not find c-ares library")

  endif()

endif()



MARK_AS_ADVANCED(

mark_as_advanced(

  CARES_LIBRARY

  CARES_INCLUDE_DIR

  )

CMake/FindGSS.cmake

+203 −207
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ message(STATUS "CFLAGS: ${_GSS_CFLAGS}") 
        RESULT_VARIABLE _GSS_CONFIGURE_FAILED

    )

    message(STATUS "LDFLAGS: ${_GSS_LIB_FLAGS}")



    if(NOT _GSS_CONFIGURE_FAILED) # 0 means success

      # this script gives us libraries and link directories. Blah. We have to deal with it.

      string(STRIP "${_GSS_LIB_FLAGS}" _GSS_LIB_FLAGS)
@@ -105,7 +106,6 @@ message(STATUS "LDFLAGS: ${_GSS_LIB_FLAGS}") 
      endforeach()

    endif()





    execute_process(

        COMMAND ${_GSS_CONFIGURE_SCRIPT} "--version"

        OUTPUT_VARIABLE _GSS_VERSION
@@ -117,7 +117,6 @@ message(STATUS "LDFLAGS: ${_GSS_LIB_FLAGS}") 
      set(_GSS_VERSION 0)

    endif()





    execute_process(

        COMMAND ${_GSS_CONFIGURE_SCRIPT} "--vendor"

        OUTPUT_VARIABLE _GSS_VENDOR
@@ -223,7 +222,6 @@ message(STATUS "LDFLAGS: ${_GSS_LIB_FLAGS}") 
      )



    endif()



  endif()

else()

  if(_GSS_PKG_${_MIT_MODNAME}_VERSION)
@@ -243,7 +241,6 @@ set(GSS_COMPILER_FLAGS ${_GSS_COMPILER_FLAGS}) 
set(GSS_VERSION ${_GSS_VERSION})



if(GSS_FLAVOUR)



  if(NOT GSS_VERSION AND GSS_FLAVOUR STREQUAL "Heimdal")

    if(CMAKE_SIZEOF_VOID_P EQUAL 8)

      set(HEIMDAL_MANIFEST_FILE "Heimdal.Application.amd64.manifest")
@@ -272,7 +269,6 @@ if(GSS_FLAVOUR) 
  endif()

endif()





include(FindPackageHandleStandardArgs)



set(_GSS_REQUIRED_VARS GSS_LIBRARIES GSS_FLAVOUR)

CMake/FindLibSSH2.cmake

+7 −7
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 


if(LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)

  set(LibSSH2_FIND_QUIETLY TRUE)

endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)

endif()



FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h

find_path(LIBSSH2_INCLUDE_DIR libssh2.h

)



FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2

find_library(LIBSSH2_LIBRARY NAMES ssh2

)



if(LIBSSH2_INCLUDE_DIR)
@@ -27,9 +27,9 @@ if(LIBSSH2_INCLUDE_DIR) 
  string(REGEX REPLACE "^0(.+)" "\\1" LIBSSH2_VERSION_PATCH "${LIBSSH2_VERSION_PATCH}")



  set(LIBSSH2_VERSION "${LIBSSH2_VERSION_MAJOR}.${LIBSSH2_VERSION_MINOR}.${LIBSSH2_VERSION_PATCH}")

endif(LIBSSH2_INCLUDE_DIR)

endif()



include(FindPackageHandleStandardArgs)

FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSSH2 DEFAULT_MSG LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY )

find_package_handle_standard_args(LibSSH2 DEFAULT_MSG LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY )



MARK_AS_ADVANCED(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY LIBSSH2_VERSION_MAJOR LIBSSH2_VERSION_MINOR LIBSSH2_VERSION_PATCH LIBSSH2_VERSION)
 
mark_as_advanced(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY LIBSSH2_VERSION_MAJOR LIBSSH2_VERSION_MINOR LIBSSH2_VERSION_PATCH LIBSSH2_VERSION)

CMake/Macros.cmake

+4 −40
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# multiple times with a sequence of possibly dependent libraries in

# order of least-to-most-dependent.  Some libraries depend on others

# to link correctly.

macro(CHECK_LIBRARY_EXISTS_CONCAT LIBRARY SYMBOL VARIABLE)

macro(check_library_exists_concat LIBRARY SYMBOL VARIABLE)

  check_library_exists("${LIBRARY};${CURL_LIBS}" ${SYMBOL} "${CMAKE_LIBRARY_PATH}"

    ${VARIABLE})

  if(${VARIABLE})
@@ -17,7 +17,7 @@ endmacro() 
# This macro is intended to be called multiple times with a sequence of

# possibly dependent header files.  Some headers depend on others to be

# compiled correctly.

macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)

macro(check_include_file_concat FILE VARIABLE)

  check_include_files("${CURL_INCLUDES};${FILE}" ${VARIABLE})

  if(${VARIABLE})

    set(CURL_INCLUDES ${CURL_INCLUDES} ${FILE})
@@ -26,7 +26,7 @@ macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) 
endmacro()



# For other curl specific tests, use this macro.

macro(CURL_INTERNAL_TEST CURL_TEST)

macro(curl_internal_test CURL_TEST)

  if(NOT DEFINED "${CURL_TEST}")

    set(MACRO_CHECK_FUNCTION_DEFINITIONS

      "-D${CURL_TEST} ${CURL_TEST_DEFINES} ${CMAKE_REQUIRED_FLAGS}")
@@ -58,43 +58,7 @@ macro(CURL_INTERNAL_TEST CURL_TEST) 
  endif()

endmacro()



macro(CURL_INTERNAL_TEST_RUN CURL_TEST)

  if(NOT DEFINED "${CURL_TEST}_COMPILE")

    set(MACRO_CHECK_FUNCTION_DEFINITIONS

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

    if(CMAKE_REQUIRED_LIBRARIES)

      set(CURL_TEST_ADD_LIBRARIES

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

    endif()



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

    try_run(${CURL_TEST} ${CURL_TEST}_COMPILE

      ${CMAKE_BINARY_DIR}

      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c

      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}

      "${CURL_TEST_ADD_LIBRARIES}"

      OUTPUT_VARIABLE OUTPUT)

    if(${CURL_TEST}_COMPILE AND NOT ${CURL_TEST})

      set(${CURL_TEST} 1 CACHE INTERNAL "Curl test ${FUNCTION}")

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

    else()

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

      set(${CURL_TEST} "" CACHE INTERNAL "Curl test ${FUNCTION}")

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

        "Performing Curl Test ${CURL_TEST} failed with the following output:\n"

        "${OUTPUT}")

      if(${CURL_TEST}_COMPILE)

        file(APPEND

          "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log"

          "There was a problem running this test\n")

      endif()

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

        "\n\n")

    endif()

  endif()

endmacro()



macro(CURL_NROFF_CHECK)

macro(curl_nroff_check)

  find_program(NROFF NAMES gnroff nroff)

  if(NROFF)

    # Need a way to write to stdin, this will do

CMake/cmake_uninstall.cmake.in

+9 −9
Original line number Diff line number Diff line 
if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")

  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")

endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")

endif()



if(NOT DEFINED CMAKE_INSTALL_PREFIX)

  set(CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
@@ -19,8 +19,8 @@ foreach(file ${files}) 
      )

    if(NOT "${rm_retval}" STREQUAL 0)

      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")

    endif(NOT "${rm_retval}" STREQUAL 0)

  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")

    endif()

  else()

    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")

  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")

endforeach(file)
 
  endif()

endforeach()