ODIN_II: added -Werror when BUILD_TYPE is release_strict

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

Makefile

@@ -33,7 +33,7 @@ override CMAKE_PARAMS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -G 'Unix Makefil
 #Are we doing a strict (i.e. warnings as errors) build?
 ifneq (,$(findstring strict,$(BUILD_TYPE)))
 	#Configure for strict build with VPR warning treated as errors
-override CMAKE_PARAMS := -DVPR_COMPILE_OPTIONS=strict ${CMAKE_PARAMS}
+override CMAKE_PARAMS := -DVTR_COMPILE_OPTIONS=strict ${CMAKE_PARAMS}
 endif #Strict build type
 
 # -s : Suppresss makefile output (e.g. entering/leaving directories)

ODIN_II/CMakeLists.txt

@@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 3.9)
 
 project("ODIN_II")
 
+#
+# ODIN_II Build Options
+#
+set(VTR_COMPILE_OPTIONS "none" CACHE STRING "Specify whether ODIN_II uses strict compiling options, e.g. -Werror")
+set(CACHE VTR_COMPILE_OPTIONS PROPERTY STRING strict none)
+
 if(ODIN_DEBUG)
 
     message("*** Compiling with Odin debug flags")
@@ -112,7 +118,7 @@ add_library(libodin_ii STATIC
              ${LIB_HEADERS_H}
              ${LIB_HEADERS_HPP}
              ${LIB_SOURCES}
-             ${FLEX_VerilogLexer_OUTPUTS} 
+             ${FLEX_VerilogLexer_OUTPUTS}
              ${BISON_VerilogParser_OUTPUT_SOURCE})
 
 target_include_directories(libodin_ii PUBLIC ${LIB_INCLUDE_DIRS})
@@ -164,4 +170,19 @@ if (ODIN_USES_IPO)
     set_target_properties(odin_II PROPERTIES LINK_FLAGS ${IPO_LINK_WARN_SUPRESS_FLAGS})
 endif()
 
+set(ODIN_COMPILE_OPTIONS_FLAGS
+    #GCC-like
+    "-Werror"
+    )
+
+#add strict odin compiler flags, if set
+if(VTR_COMPILE_OPTIONS STREQUAL "strict")
+    message(STATUS "ODIN_II: building with strict flags")
+    foreach(ODIN_FLAG ${ODIN_COMPILE_OPTIONS_FLAGS})
+        message(STATUS "\tAdding CXX flag: ${ODIN_FLAG}")
+        target_compile_options(libodin_ii PRIVATE ${ODIN_FLAG})
+        target_compile_options(odin_II PRIVATE ${ODIN_FLAG})
+    endforeach()
+endif()
+
 install(TARGETS odin_II libodin_ii DESTINATION bin)

vpr/CMakeLists.txt

@@ -5,8 +5,8 @@ project("vpr")
 #
 # VPR Build Options
 #
-set(VPR_COMPILE_OPTIONS "none" CACHE STRING "Specify whether vpr uses strict compiling options, e.g. -Werror")
-set(CACHE VPR_COMPILE_OPTIONS PROPERTY STRING strict none)
+set(VTR_COMPILE_OPTIONS "none" CACHE STRING "Specify whether vpr uses strict compiling options, e.g. -Werror")
+set(CACHE VTR_COMPILE_OPTIONS PROPERTY STRING strict none)
 
 set(VPR_EXECUTION_ENGINE "auto" CACHE STRING "Specify the framework for (potential) parallel execution")
 set_property(CACHE VPR_EXECUTION_ENGINE PROPERTY STRINGS auto serial tbb)
@@ -68,7 +68,7 @@ target_link_libraries(libvpr
 
 #link graphics library only when graphics set to on
 if (VPR_USE_EZGL STREQUAL "on")
-    target_link_libraries(libvpr 
+    target_link_libraries(libvpr
 			     ezgl)
 
     compile_gresources(
@@ -164,7 +164,7 @@ else()
     message(ERROR "Unsupported VPR_PGO_CONFIG '${VPR_PGO_CONFIG}'")
 endif()
 
-if (VPR_COMPILE_OPTIONS STREQUAL "strict")
+if (VTR_COMPILE_OPTIONS STREQUAL "strict")
     message(STATUS "VPR: building with strict flags")
     foreach(flag ${VPR_COMPILE_OPTIONS_FLAGS})
         message(STATUS "\tAdding CXX flag: ${flag}")