commit 6e0cac1f577db5042655c11e3562dcc53fb9df55
author Christoph M. Wintersteiger <cwinter@microsoft.com> Fri Feb 22 17:02:12 2019 +0000
committer Janos Follath <janos.follath@arm.com> Mon Aug 19 13:37:46 2019 +0100
tree e473a454b005caa13a26e10bbb0f10fe34d8f25e
parent 2c69d10bac678d0d86615de3d01b3d5bbb4b8c45

3rdparty: Fix Everest build to not depend on build-time macros

3rdparty/everest/CMakeLists.txt

diff --git a/3rdparty/everest/CMakeLists.txt b/3rdparty/everest/CMakeLists.txt
index 2c5d7d5..ede0e83 100644
--- a/3rdparty/everest/CMakeLists.txt
+++ b/3rdparty/everest/CMakeLists.txt
@@ -2,26 +2,17 @@
 list (APPEND everest_inc)
 list (APPEND everest_def)
 
+set(everest_src
+  ${CMAKE_CURRENT_SOURCE_DIR}/library/everest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/library/x25519.c  
+  ${CMAKE_CURRENT_SOURCE_DIR}/library/Hacl_Curve25519_joined.c
+)
+
+list(APPEND everest_inc ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/everest ${CMAKE_CURRENT_SOURCE_DIR}/include/everest/kremlib)
+
 execute_process(COMMAND ${PERL_EXECUTABLE} scripts/config.pl -f include/mbedtls/config.h get MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED RESULT_VARIABLE result)
 
 if(${result} EQUAL 0)
-  set(everest_src
-    ${CMAKE_CURRENT_SOURCE_DIR}/library/everest.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/library/x25519.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c
-  )
-
-  if ("${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "x86_64-linux-gnu")
-  list(APPEND everest_src ${CMAKE_CURRENT_SOURCE_DIR}/library/Hacl_Curve25519.c)
-  else()
-  list(APPEND everest_def -DKRML_VERIFIED_UINT128)
-  list(APPEND everest_src
-    ${CMAKE_CURRENT_SOURCE_DIR}/library/legacy/Hacl_Curve25519.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/library/kremlib/FStar_UInt128_extracted.c
-  )
-  endif()
-
-  list(APPEND everest_inc ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/everest ${CMAKE_CURRENT_SOURCE_DIR}/include/everest/kremlib)
 
   if(INSTALL_MBEDTLS_HEADERS)