From afc6f79038522244b8b1149a2cd8e979945f1ccd Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Mon, 12 Aug 2013 15:38:58 +0400 Subject: [PATCH] Inlined the getMD5 macro, which no longer saves us anything. --- 3rdparty/tbb/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/3rdparty/tbb/CMakeLists.txt b/3rdparty/tbb/CMakeLists.txt index d460837f84..4e510ffa32 100644 --- a/3rdparty/tbb/CMakeLists.txt +++ b/3rdparty/tbb/CMakeLists.txt @@ -82,12 +82,8 @@ endif() set(tbb_tarball "${CMAKE_CURRENT_SOURCE_DIR}/${tbb_ver}_src.tgz") set(tbb_src_dir "${CMAKE_CURRENT_BINARY_DIR}/${tbb_ver}") -macro(getMD5 filename varname) - file(MD5 "${filename}" ${varname}) -endmacro() - if(EXISTS "${tbb_tarball}") - getMD5("${tbb_tarball}" tbb_local_md5) + file(MD5 "${tbb_tarball}" tbb_local_md5) if(NOT tbb_local_md5 STREQUAL tbb_md5) message(WARNING "Local copy of TBB source tarball has invalid MD5 hash: ${tbb_local_md5} (expected: ${tbb_md5})") file(REMOVE "${tbb_tarball}") @@ -103,7 +99,7 @@ if(NOT EXISTS "${tbb_tarball}") if(NOT __statvar EQUAL 0) message(FATAL_ERROR "Failed to download TBB sources: ${tbb_url}") endif() - getMD5("${tbb_tarball}" tbb_local_md5) + file(MD5 "${tbb_tarball}" tbb_local_md5) if(NOT tbb_local_md5 STREQUAL tbb_md5) file(REMOVE "${tbb_tarball}") message(FATAL_ERROR "Downloaded TBB source tarball has invalid MD5 hash: ${tbb_local_md5} (expected: ${tbb_md5})")