Make c++17 default, link against onnxruntime if ONNX module is enabled (

#76)
rwth-i6 · Nov 7, 2024 · 11e8ad6 · 11e8ad6
1 parent 6441be5
commit 11e8ad6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/config/cc-gcc.make b/config/cc-gcc.make
@@ -27,7 +27,7 @@ CCFLAGS		+= -pipe
 CCFLAGS		+= -funsigned-char
 CCFLAGS		+= -fno-exceptions
 CFLAGS		+= -std=c99
-CXXFLAGS	+= -std=gnu++0x
+CXXFLAGS	+= -std=gnu++17
 CXXFLAGS	+= -Wno-unknown-pragmas
 #CCFLAGS	+= -pedantic
 CCFLAGS		+= -Wall

diff --git a/config/os-linux.make b/config/os-linux.make
@@ -62,6 +62,14 @@ TF_LDFLAGS += -Wl,-rpath -Wl,$(TF_COMPILE_BASE)/bazel-bin/tensorflow
 # USE_TENSORFLOW_MKL=1
 endif
 
+
+ifdef MODULE_ONNX
+LDFLAGS += -lonnxruntime
+ifndef MODULE_TENSORFLOW
+CXXFLAGS += -fexceptions
+endif
+endif
+
 # -----------------------------------------------------------------------------
 # system Libraries