Skip to content

Commit

Permalink
Resolve name clashes by prefixing with RELIC_
Browse files Browse the repository at this point in the history
  • Loading branch information
sruesch committed May 15, 2016
1 parent 2597946 commit 87a0a8b
Show file tree
Hide file tree
Showing 62 changed files with 745 additions and 745 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,23 +99,23 @@ message(" ALLOC=STACK All memory is allocated from the stack.\n")

message(STATUS "Supported operating systems (default = LINUX):\n")

message(" OPSYS=NONE Undefined/No operating system.")
message(" OPSYS=RELIC_NONE Undefined/No operating system.")
message(" OPSYS=LINUX GNU/Linux operating system.")
message(" OPSYS=FREEBSD FreeBSD operating system.")
message(" OPSYS=MACOSX Mac OS X operating system.")
message(" OPSYS=WINDOWS Windows operating system.")
message(" OPSYS=DROID Android operating system.")
message(" OPSYS=DUINO Arduino platform.\n")

message(STATUS "Supported multithreading APIs (default = NONE):\n")
message(STATUS "Supported multithreading APIs (default = RELIC_NONE):\n")

message(" MULTI=NONE NO multithreading support.")
message(" MULTI=RELIC_NONE NO multithreading support.")
message(" MULTI=OPENMP Open Multi-Processing.")
message(" MULTI=PTHREAD POSIX threads.\n")

message(STATUS "Supported timers (default = HPROC):\n")

message(" TIMER=NONE No timer.")
message(" TIMER=RELIC_NONE No timer.")
message(" TIMER=HREAL GNU/Linux realtime high-resolution timer.")
message(" TIMER=HPROC GNU/Linux per-process high-resolution timer.")
message(" TIMER=HTHRD GNU/Linux per-thread high-resolution timer.")
Expand Down Expand Up @@ -312,7 +312,7 @@ else(CMAKE_SYSTEM_NAME STREQUAL Linux)
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
set(OPSYS "MACOSX" CACHE STRING "Operating system")
else(CMAKE_SYSTEM_NAME STREQUAL Darwin)
set(OPSYS "NONE" CACHE STRING "Operating system")
set(OPSYS "RELIC_NONE" CACHE STRING "Operating system")
endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
endif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
Expand Down Expand Up @@ -347,7 +347,7 @@ else(MULTI STREQUAL OPENMP)
set(CFLAGS "${CFLAGS} -pthread")
set(MULTI "PTHREAD" CACHE STRING "Multithreading interface")
else(MULTI STREQUAL PTHREAD)
set(MULTI "NONE" CACHE STRING "Operating system")
set(MULTI "RELIC_NONE" CACHE STRING "Operating system")
endif(MULTI STREQUAL PTHREAD)
endif(MULTI STREQUAL OPENMP)

Expand Down
Loading

0 comments on commit 87a0a8b

Please sign in to comment.