Utests: respect existing C/CXXFLAGS

Submitted by Rebecca N. Palmer on Oct. 8, 2016, 1:28 p.m.

Details

Message ID 9c85b715-372b-3436-5669-758d928d541d@zoho.com
State New
Headers show
Series "Utests: respect existing C/CXXFLAGS" ( rev: 1 ) in Beignet

Not browsing as part of any series.

Commit Message

Rebecca N. Palmer Oct. 8, 2016, 1:28 p.m.
This extends 4be3664 to the test suite.

Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>
---
 utests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt
index a5d8d40..8b33666 100644
--- a/utests/CMakeLists.txt
+++ b/utests/CMakeLists.txt
@@ -26,8 +26,8 @@  if (NOT NOT_BUILD_STAND_ALONE_UTEST)
   # Threads
   Find_Package(Threads)
 
-  set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
-  set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-invalid-offsetof")
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
   set (CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DGBE_DEBUG=1")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
   set (CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")

Comments

LGTM, pushed, thanks.

> -----Original Message-----

> From: Beignet [mailto:beignet-bounces@lists.freedesktop.org] On Behalf Of

> Rebecca N. Palmer

> Sent: Saturday, October 8, 2016 21:28

> To: beignet@lists.freedesktop.org

> Subject: [Beignet] [PATCH] Utests: respect existing C/CXXFLAGS

> 

> This extends 4be3664 to the test suite.

> 

> Signed-off-by: Rebecca N. Palmer <rebecca_palmer@zoho.com>

> ---

>  utests/CMakeLists.txt | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index

> a5d8d40..8b33666 100644

> --- a/utests/CMakeLists.txt

> +++ b/utests/CMakeLists.txt

> @@ -26,8 +26,8 @@ if (NOT NOT_BUILD_STAND_ALONE_UTEST)

>    # Threads

>    Find_Package(Threads)

> 

> -  set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -std=c++0x -Wno-

> invalid-offsetof")

> -  set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")

> +  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS}

> + -std=c++0x -Wno-invalid-offsetof")  set (CMAKE_C_FLAGS

> + "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")

>    set (CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DGBE_DEBUG=1")

>    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")

>    set (CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")

> --

> 2.1.4

> 

> 

> _______________________________________________

> Beignet mailing list

> Beignet@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/beignet