Fix warnings in C++ test suite build

pradeeptrgit · pradeeptrgit · commit 2cfd055a5d8e · 2020-11-19T17:12:59.000+05:30
Change-Id: I41b4b751284635957b08f1b1b4e9956fbbf61976
diff --git a/testcpp/Makefile b/testcpp/Makefile
@@ -26,7 +26,7 @@
 BUILD_DIR       := ../build
 CONFIG_DIR      := ../config
 LIB_DIR         := ../lib
-INCLUDE_DIR     := ../src/aocl_dtl ../src/base/flamec/include -I../config/x86_64-unknown-linux-gnu
+INCLUDE_DIR     := ../src/aocl_dtl -I../src/base/flamec/include -I../config/x86_64-unknown-linux-gnu
 SRC_PATH        := ../src
 HOST            := $(shell sh $(BUILD_DIR)/ac-utils/config.guess)
 CONFIG_MK_FILE  := $(CONFIG_DIR)/$(HOST)/config.mk
diff --git a/testcpp/src/libflame_test.hh b/testcpp/src/libflame_test.hh
@@ -43,7 +43,9 @@ extern "C"{
 #include "FLA_util_lapack_prototypes.h"
 }
 
+#ifndef FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES
 #define FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES
+#endif
 
 using namespace std;
 typedef int FLA_Error;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ extern "C"{`
`43`	`43`	`#include "FLA_util_lapack_prototypes.h"`
`44`	`44`	`}`
`45`	`45`
	`46`	`+#ifndef FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES`
`46`	`47`	`#define FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES`
	`48`	`+#endif`
`47`	`49`
`48`	`50`	`using namespace std;`
`49`	`51`	`typedef int FLA_Error;`