From 9db3e54556f2c702efc63055caf30769fb8d8e7a Mon Sep 17 00:00:00 2001 From: "william.v.posey" Date: Tue, 4 Jun 2024 11:06:33 +0000 Subject: [PATCH] #249 fixed custom path variable use in CMakeLists.txt and src/CMakeLists.txt --- CMakeLists.txt | 12 ++++++++---- src/CMakeLists.txt | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 110245aa..8e32bcfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,29 +67,33 @@ OPTION(KMC_CFFI_EXCLUDE "KMC-Exclude-Problematic-CFFI-Code" OFF) #Disabled by de # Custom Module Paths # if(KEY_CUSTOM) - if(NOT DEFINED ${KEY_CUSTOM_PATH}) + if(NOT DEFINED KEY_CUSTOM_PATH) set(KEY_CUSTOM_PATH ${KEY_CUSTOM_PATH_DEFAULT}) + message(STATUS "Default path set for KEY_CUSTOM_PATH") endif() message(STATUS "KEY_CUSTOM being utilized. Path set to: ${KEY_CUSTOM_PATH}") endif() if(MC_CUSTOM) - if(NOT DEFINED ${KEY_CUSTOM_PATH}) + if(NOT DEFINED MC_CUSTOM_PATH) set(MC_CUSTOM_PATH ${MC_CUSTOM_PATH_DEFAULT}) + message(STATUS "Default path set for MC_CUSTOM_PATH") endif() message(STATUS "MC_CUSTOM being utilized. Path set to: ${MC_CUSTOM_PATH}") endif() if(SA_CUSTOM) - if(NOT DEFINED ${SA_CUSTOM_PATH}) + if(NOT DEFINED SA_CUSTOM_PATH) set(SA_CUSTOM_PATH ${SA_CUSTOM_PATH_DEFAULT}) + message(STATUS "Default path set for SA_CUSTOM_PATH") endif() message(STATUS "SA_CUSTOM being utilized. Path set to: ${SA_CUSTOM_PATH}") endif() if(CRYPTO_CUSTOM) - if(NOT DEFINED ${CRYPTO_CUSTOM_PATH}) + if(NOT DEFINED CRYPTO_CUSTOM_PATH) set(CRYPTO_CUSTOM_PATH ${CRYPTO_CUSTOM_PATH_DEFAULT}) + message(STATUS "Default path set for CRYPTO_CUSTOM_PATH") endif() message(STATUS "CRYPTO_CUSTOM being utilized. Path set to: ${CRYPTO_CUSTOM_PATH}") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 26e32e0c..54744f43 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(../include) aux_source_directory(core LIB_SRC_FILES) if(CRYPTO_CUSTOM) - aux_source_directory(CRYPTO_CUSTOM_PATH CRYPTO_FILES) + aux_source_directory(${CRYPTO_CUSTOM_PATH} CRYPTO_FILES) list(APPEND LIB_SRC_FILES ${CRYPTO_FILES}) else() aux_source_directory(crypto/custom_stub CRYPTO_FILES) @@ -53,7 +53,7 @@ endif() if(KEY_CUSTOM) # Assumes CryptoLib is a Git submodule to project and custom directories and definitions exist at top level - aux_source_directory(KEY_CUSTOM_PATH KEY_CUSTOM_FILES) + aux_source_directory(${KEY_CUSTOM_PATH} KEY_CUSTOM_FILES) list(APPEND LIB_SRC_FILES ${KEY_CUSTOM_FILES}) else() aux_source_directory(key/custom_stub KEY_CUSTOM_FILES) @@ -78,7 +78,7 @@ endif() if(MC_CUSTOM) # Assumes CryptoLib is a Git submodule to project and custom directories and definitions exist at top level - aux_source_directory(MC_CUSTOM_PATH MC_CUSTOM_FILES) + aux_source_directory(${MC_CUSTOM_PATH} MC_CUSTOM_FILES) list(APPEND LIB_SRC_FILES ${MC_CUSTOM_FILES}) else() aux_source_directory(mc/custom_stub MC_CUSTOM_FILES) @@ -103,7 +103,7 @@ endif() if(SA_CUSTOM) # Assumes CryptoLib is a Git submodule to project and custom directories and definitions exist at top level - aux_source_directory(SA_CUSTOM_PATH SA_CUSTOM_FILES) + aux_source_directory(${SA_CUSTOM_PATH} SA_CUSTOM_FILES) list(APPEND LIB_SRC_FILES ${SA_CUSTOM_FILES}) else() aux_source_directory(sa/custom_stub SA_CUSTOM_FILES)