moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

Cmake: Removed repeated content from ending blocks

Browse Source 
They are unnecesary in modern CMake and removing them improves readability.
This commit is contained in:
Jakub Zakrzewski 2014-08-15 14:57:53 +02:00 committed by Daniel Stenberg
parent 06de7d6936
commit ba8795083f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMake/CurlCheckCSourceCompiles.cmake
View File

@ -19,17 +19,17 @@ macro(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR)
if(${ARGC} GREATER 2) if(${ARGC} GREATER 2)
# then add the third argument as a message # then add the third argument as a message
set(message "${ARGV2} (${VAR})") set(message "${ARGV2} (${VAR})")
endif(${ARGC} GREATER 2) endif()
set(MACRO_CHECK_FUNCTION_DEFINITIONS set(MACRO_CHECK_FUNCTION_DEFINITIONS
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}") "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
if(CMAKE_REQUIRED_LIBRARIES) if(CMAKE_REQUIRED_LIBRARIES)
set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES set(CURL_CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
endif(CMAKE_REQUIRED_LIBRARIES) endif()
if(CMAKE_REQUIRED_INCLUDES) if(CMAKE_REQUIRED_INCLUDES)
set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES set(CURL_CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
endif(CMAKE_REQUIRED_INCLUDES) endif()
set(src "") set(src "")
foreach(def ${EXTRA_DEFINES}) foreach(def ${EXTRA_DEFINES})
set(src "${src}#define ${def} 1\n") set(src "${src}#define ${def} 1\n")
@ -59,13 +59,13 @@ macro(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR)
"Performing C SOURCE FILE Test ${message} succeded with the following output:\n" "Performing C SOURCE FILE Test ${message} succeded with the following output:\n"
"${OUTPUT}\n" "${OUTPUT}\n"
"Source file was:\n${src}\n") "Source file was:\n${src}\n")
else(${VAR}) else()
message(STATUS "Performing Test ${message} - Failed") message(STATUS "Performing Test ${message} - Failed")
set(${VAR} "" CACHE INTERNAL "Test ${message}") set(${VAR} "" CACHE INTERNAL "Test ${message}")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Performing C SOURCE FILE Test ${message} failed with the following output:\n" "Performing C SOURCE FILE Test ${message} failed with the following output:\n"
"${OUTPUT}\n" "${OUTPUT}\n"
"Source file was:\n${src}\n") "Source file was:\n${src}\n")
endif(${VAR}) endif()
endif("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") endif()
endmacro(CURL_CHECK_C_SOURCE_COMPILES) endmacro()