From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 12 May 2010 08:06:54 +0000 (-0400)
Subject: Simplify an MD_CHECK macro in CMakeLists.txt.
X-Git-Tag: v3.0.0a~1010
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c3d02d8bfbefd2bbdca17a6dbbc5f35f1f1a72;p=thirdparty%2Flibarchive.git

Simplify an MD_CHECK macro in CMakeLists.txt.
Using MD_CHECK_{hash name} confuses a person who uses CMake -U option,
which removes a specified variable from CMakeCache.

SVN-Revision: 2387
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1726acd2..9c6329f7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,9 +273,6 @@ 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})
 	STRING(TOLOWER "${HASH}" lower_hash)
 	STRING(TOUPPER "${HASH}" hash)
 
@@ -304,22 +301,18 @@ main(int argc, char **argv)
 	FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" "${SOURCE}")
 	MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}")
 
-	TRY_COMPILE(CHECK_MD_${HASH}
+	TRY_COMPILE(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION}
 	  ${CMAKE_BINARY_DIR}
 	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c
 	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
 	  OUTPUT_VARIABLE OUTPUT)
 
-	IF (CHECK_MD_${HASH})
+	IF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
 	    MESSAGE(STATUS "Checking support for ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} -- found")
-	    SET(ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} 1 CACHE INTERNAL
-	        "${HASH} via ARCHIVE_HASH_${HASH}_${IMPLEMENTATION} supported")
 	    BREAK()
-	ENDIF(CHECK_MD_${HASH})
+	ENDIF (ARCHIVE_HASH_${HASH}_${IMPLEMENTATION})
 
 	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"