Move RiscV flag

deephealthproject · Oct 17, 2022 · 6964bca · 6964bca
1 parent d78d44b
commit 6964bca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,11 +84,6 @@ if(UNIX)
     set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
-    if(${BUILD_TARGET} STREQUAL "RISCV")
-    	set(CMAKE_C_FLAGS_RELEASE "-O2 -march=rv64imafdc -mabi=lp64d ")
-    	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -march=rv64imafdc -mabi=lp64d ")
-    endif()
-
     # Flags: Sanitizers
     # For the visualized output to be available, switch to Clang at least 3.8.0 or GCC at least 5.0.0
     if(BUILD_SANITIZERS)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -125,6 +125,11 @@ endif()
 ########################## COMPILE FOR RISK-V #############################
 ###########################################################################
 
+if(USE_RISCV)
+    set(CMAKE_C_FLAGS_RELEASE "-O2 -march=rv64imafdc -mabi=lp64d ")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -march=rv64imafdc -mabi=lp64d ")
+endif()
+
 if(RISKV_COMPILER_PATH)
     message(STATUS "Compiling for Risk-V...")
 endif()
@@ -502,10 +507,8 @@ if(USE_FPGA)
     message(STATUS "OpenCL include: " ${OpenCL_INCLUDE_DIRS} )
     message(STATUS "OpenCL libraries: " ${OpenCL_LIBRARIES} )
 endif()
-if(RISKV_COMPILER_PATH)
-    message(STATUS "-------------------------------------------" )
-    message(STATUS "Risk-V compiler: " ${RISKV_COMPILER_PATH} )
-endif()
+message(STATUS "-------------------------------------------" )
+message(STATUS "RISCV enabled: " ${USE_RISCV} )
 message(STATUS "-------------------------------------------" )
 message(STATUS "Eigen3 root dir: " ${Eigen3_DIR} )
 message(STATUS "Eigen3 include: " ${EIGEN3_INCLUDE_DIR} )