Changeset: dd9b12fefa88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd9b12fefa88
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Set only one variable.
diffs (31 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,10 +364,7 @@ set(THREAD_LIBRARIES "${CMAKE_THREAD_LIB
# Password hash algorithm
set(PASSWORD_BACKEND "SHA512" CACHE STRING "Password hash algorithm, one of
MD5, SHA1, RIPEMD160, SHA224, SHA256, SHA384, SHA512, defaults to SHA512")
-if(${PASSWORD_BACKEND} MATCHES
"^MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512$")
- set(MONETDB5_PASSWDHASH ${PASSWORD_BACKEND})
- set(MONETDB5_PASSWDHASH_TOKEN ${PASSWORD_BACKEND})
-else()
+if(NOT ${PASSWORD_BACKEND} MATCHES
"^MD5|SHA1|RIPEMD160|SHA224|SHA256|SHA384|SHA512$")
message(FATAL_ERROR "PASSWORD_BACKEND invalid, choose one of MD5, SHA1,
RIPEMD160, SHA224, SHA256, SHA384, SHA512")
endif()
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -238,10 +238,10 @@
#cmakedefine LOCALSTATEDIR "@LOCALSTATE_DIR@"
/* The used password hash algorithm */
-#cmakedefine MONETDB5_PASSWDHASH "@MONETDB5_PASSWDHASH@"
+#define MONETDB5_PASSWDHASH "@PASSWORD_BACKEND@"
/* The used password hash algorithm */
-#cmakedefine MONETDB5_PASSWDHASH_TOKEN @MONETDB5_PASSWDHASH_TOKEN@
+#define MONETDB5_PASSWDHASH_TOKEN @PASSWORD_BACKEND@
/* Release name or "unreleased" */
#cmakedefine MONETDB_RELEASE "@MONETDB_RELEASE@"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
