Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename Relic's custom CFLAGS to COMP_FLAGS. Addresses issue #267. #269

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Rename Relic's custom CFLAGS to COMP_FLAGS. Addresses issue #267. #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
hoffmang9 marked this conversation as resolved.
Show resolved Hide resolved
GIT_TAG ${RELIC_GIT_TAG}
)
FetchContent_MakeAvailable(relic)
Expand Down