Changed the method to include the ECCLVL constant to be defined (whic…

…h is dependent on cmake settings since it is used for the relic library too).
encryptogroup · Aug 20, 2019 · d084930 · d084930
1 parent 3fe57d3
commit d084930
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,13 +25,17 @@ add_library(ENCRYPTO_utils::encrypto_utils ALIAS encrypto_utils)
 
 target_compile_features(encrypto_utils PUBLIC cxx_std_17)
 target_compile_options(encrypto_utils PRIVATE "-Wall" "-Wextra")
-#Maybe it is better to create a ecc-pk-crypti.h.in file, since the ecclvl is only needed there
-target_compile_definitions(encrypto_utils PUBLIC ECCLVL=${ecclvl})
+
+configure_file (
+    "${CMAKE_CURRENT_SOURCE_DIR}/ENCRYPTO_utils/cmake_constants.h.in"
+    "${PROJECT_BINARY_DIR}/include/cmake_constants.h"
+)
 
 target_include_directories(encrypto_utils
     PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
 )
 
 

diff --git a/src/ENCRYPTO_utils/cmake_constants.h.in b/src/ENCRYPTO_utils/cmake_constants.h.in
@@ -0,0 +1,2 @@
+//the security parameter for public crypto
+#define ECCLVL @ecclvl@
diff --git a/src/ENCRYPTO_utils/constants.h b/src/ENCRYPTO_utils/constants.h
@@ -21,6 +21,7 @@
 
 #include "typedefs.h"
 #include <cstdint>
+#include <cmake_constants.h>
 
 #define BATCH
 //#define FIXED_KEY_AES_HASHING
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		//the security parameter for public crypto
		#define ECCLVL @ecclvl@