From 89a9ec8d17439954f1ab8e8a623a0a41c78a22e6 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 16 Aug 2021 20:20:58 +0100
Subject: [PATCH] Rename "local" CFLAGS to COMP_FLAGS. Addresses issue #267.

---
 CMakeLists.txt     | 2 +-
 src/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f73948c17..d84dddbd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ set(STBIN "OFF" CACHE STRING "")
 set(FP_METHD "INTEG;INTEG;INTEG;MONTY;LOWER;SLIDE" CACHE STRING "")
 
 if(NOT MSVC)
-  set(CFLAGS "-O3 -funroll-loops -fomit-frame-pointer" CACHE STRING "")
+  set(COMP_FLAGS "-O3 -funroll-loops -fomit-frame-pointer" CACHE STRING "")
 endif()
 
 set(FP_PMERS "off" CACHE STRING "")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4559c5731..1725c0afa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,14 +4,15 @@ set (CMAKE_CXX_STANDARD 17)
 if (DEFINED ENV{RELIC_MAIN})
   set(RELIC_GIT_TAG "origin/main")
 else ()
-  set(RELIC_GIT_TAG "b7b2266a0e4ee6f628f61d3ab638f524a18b52f1")
+  # This is currently anchored to upstream b7b2266a0e4ee6f628f61d3ab638f524a18b52f1
+  set(RELIC_GIT_TAG "d20d97c046da2c1689916569e9895b48a4693624")
 endif ()
 
 message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
 
 FetchContent_Declare(
   relic
-  GIT_REPOSITORY https://github.com/relic-toolkit/relic.git
+  GIT_REPOSITORY https://github.com/AmineKhaldi/relic.git
   GIT_TAG        ${RELIC_GIT_TAG}
 )
 FetchContent_MakeAvailable(relic)