From: Michihiro NAKAJIMA Date: Mon, 10 May 2010 13:10:28 +0000 (-0400) Subject: Do not always compile for ARCHIVE_HASH_* on CMake build system. X-Git-Tag: v3.0.0a~1019 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2066ed56dcf2757021825399a01c3d844e909afe;p=thirdparty%2Flibarchive.git Do not always compile for ARCHIVE_HASH_* on CMake build system. Put the results in the CMake Cache. SVN-Revision: 2376 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ec82efb85..4c314e611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,6 +272,7 @@ ENDIF() MACRO(CHECK_MD HASH IMPLEMENTATIONS) FOREACH(IMPLEMENTATION ${IMPLEMENTATIONS}) + IF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) IF (CHECK_MD_${HASH}) BREAK() ENDIF (CHECK_MD_${HASH}) @@ -311,15 +312,19 @@ main(int argc, char **argv) IF (CHECK_MD_${HASH}) MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- found") - SET(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} 1) + SET(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} 1 CACHE INTERNAL + "${HASH} via ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} supported") BREAK() ENDIF(CHECK_MD_${HASH}) MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- not found") + SET(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} "" CACHE INTERNAL + "${HASH} via ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} supported") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} failed with the following output:\n" "${OUTPUT}\n" "Source file was:\n${SOURCE}\n") + ENDIF(NOT DEFINED ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}) ENDFOREACH(IMPLEMENTATION) ENDMACRO(CHECK_MD HASH IMPLEMENTATIONS)