diff options
| author | Sascha Cunz <sascha.cunz@gmail.com> | 2014-01-30 02:28:53 +0000 |
|---|---|---|
| committer | Sascha Cunz <sascha.cunz@gmail.com> | 2014-01-30 02:35:09 +0000 |
| commit | 39949f0604cb009d850ff080f630ccdf7ab11715 (patch) | |
| tree | c89b51e2b1f52ca015d668e90ddc6535a56db63a /cmake/Modules | |
| parent | 60306450b7a7354825660e69a30877760c48395a (diff) | |
| download | libgit2-39949f0604cb009d850ff080f630ccdf7ab11715.tar.gz | |
Cleanup FindIconv.cmake
Doesn't change anything. Just removes stuff that was probably missed
to remove when this was imported.
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/FindIconv.cmake | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake index fb6d1e210..487b2f557 100644 --- a/cmake/Modules/FindIconv.cmake +++ b/cmake/Modules/FindIconv.cmake @@ -4,13 +4,12 @@ # ICONV_FOUND - system has Iconv # ICONV_INCLUDE_DIR - the Iconv include directory # ICONV_LIBRARIES - Link these to use Iconv -# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const # -IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) +IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) # Already in cache, be silent SET(ICONV_FIND_QUIETLY TRUE) -ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) +ENDIF() FIND_PATH(ICONV_INCLUDE_DIR iconv.h) @@ -18,25 +17,19 @@ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c PATH) IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) SET(ICONV_FOUND TRUE) -ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) - -set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) -set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) -set(CMAKE_REQUIRED_INCLUDES) -set(CMAKE_REQUIRED_LIBRARIES) +ENDIF() IF(ICONV_FOUND) IF(NOT ICONV_FIND_QUIETLY) MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") ENDIF(NOT ICONV_FIND_QUIETLY) -ELSE(ICONV_FOUND) +ELSE() IF(Iconv_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find Iconv") ENDIF(Iconv_FIND_REQUIRED) -ENDIF(ICONV_FOUND) +ENDIF() MARK_AS_ADVANCED( ICONV_INCLUDE_DIR ICONV_LIBRARIES - ICONV_SECOND_ARGUMENT_IS_CONST ) |