summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-11-11 23:09:44 -0500
committerEdward Thomson <ethomson@edwardthomson.com>2021-11-14 07:25:41 -0500
commit2c154145a8f7ce3c01f1afc40e3934c1e43c377e (patch)
tree521194932d773c1644128f3173ccafab3009f3c4 /cmake
parentc7f6ecb3911b5bc8052428a3605802403c673730 (diff)
downloadlibgit2-2c154145a8f7ce3c01f1afc40e3934c1e43c377e.tar.gz
cmake: move sha1 source selection into CMakeLists.txt
The select hashes module selects the hash; the CMakeLists.txt selects the files to implement it.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/SelectHashes.cmake14
1 files changed, 2 insertions, 12 deletions
diff --git a/cmake/SelectHashes.cmake b/cmake/SelectHashes.cmake
index fdefb57fd..bedd8c4e3 100644
--- a/cmake/SelectHashes.cmake
+++ b/cmake/SelectHashes.cmake
@@ -24,7 +24,6 @@ if(USE_SHA1 STREQUAL "CollisionDetection")
add_definitions(-DSHA1DC_NO_STANDARD_INCLUDES=1)
add_definitions(-DSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"common.h\")
add_definitions(-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C=\"common.h\")
- file(GLOB SRC_SHA1 hash/sha1/collisiondetect.* hash/sha1/sha1dc/*)
elseif(USE_SHA1 STREQUAL "OpenSSL")
# OPENSSL_FOUND should already be set, we're checking USE_HTTPS
@@ -34,29 +33,20 @@ elseif(USE_SHA1 STREQUAL "OpenSSL")
else()
list(APPEND LIBGIT2_PC_REQUIRES "openssl")
endif()
- file(GLOB SRC_SHA1 hash/sha1/openssl.*)
elseif(USE_SHA1 STREQUAL "CommonCrypto")
set(GIT_SHA1_COMMON_CRYPTO 1)
- file(GLOB SRC_SHA1 hash/sha1/common_crypto.*)
elseif(USE_SHA1 STREQUAL "mbedTLS")
set(GIT_SHA1_MBEDTLS 1)
- file(GLOB SRC_SHA1 hash/sha1/mbedtls.*)
list(APPEND LIBGIT2_SYSTEM_INCLUDES ${MBEDTLS_INCLUDE_DIR})
- list(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES})
+ list(APPEND LIBGIT2_SYSTEM_LIBS ${MBEDTLS_LIBRARIES})
# mbedTLS has no pkgconfig file, hence we can't require it
# https://github.com/ARMmbed/mbedtls/issues/228
# For now, pass its link flags as our own
list(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES})
elseif(USE_SHA1 STREQUAL "Win32")
set(GIT_SHA1_WIN32 1)
- file(GLOB SRC_SHA1 hash/sha1/win32.*)
-elseif(USE_SHA1 STREQUAL "Generic")
- file(GLOB SRC_SHA1 hash/sha1/generic.*)
-else()
+elseif(NOT (USE_SHA1 STREQUAL "Generic"))
message(FATAL_ERROR "Asked for unknown SHA1 backend: ${USE_SHA1}")
endif()
-list(APPEND SRC_SHA1 "hash/sha1.h")
-list(SORT SRC_SHA1)
-
add_feature_info(SHA ON "using ${USE_SHA1}")