From 82b2dbe4956cc5f62612532567fd38ee0084ff27 Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Wed, 17 Mar 2021 17:49:24 -0500 Subject: [PATCH] Don't overwrite default CMAKE_CXX_FLAGS in tests & samples Change-Id: I4a2bb0bcc320fb0645e9fc5447775e6a878b960b --- rocrtst/samples/CMakeLists.txt | 3 +-- rocrtst/suites/test_common/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rocrtst/samples/CMakeLists.txt b/rocrtst/samples/CMakeLists.txt index aed6556c33..fa74c44eef 100755 --- a/rocrtst/samples/CMakeLists.txt +++ b/rocrtst/samples/CMakeLists.txt @@ -179,8 +179,7 @@ add_definitions(-DLITTLEENDIAN_CPU=1) # # Linux Compiler options # -set(CMAKE_CXX_FLAGS "-std=c++11 ") - +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno") diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt index 0c33db2c10..2f70ae5b69 100755 --- a/rocrtst/suites/test_common/CMakeLists.txt +++ b/rocrtst/suites/test_common/CMakeLists.txt @@ -201,8 +201,7 @@ add_definitions(-DLITTLEENDIAN_CPU=1) # # Linux Compiler options # -set(CMAKE_CXX_FLAGS "-std=c++11 ") - +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")