diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-05-24 16:13:49 +0100 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2016-05-25 12:26:15 +0800 |
| commit | 4be3664557e691afe25171034163f9e62f20254f (patch) | |
| tree | b18c115a2ef5406ddee6a6fc5e3af8d781cc4a49 /CMakeLists.txt | |
| parent | c511a8f051a6efa57fa28314a7b5f51b658afa59 (diff) | |
| download | beignet-4be3664557e691afe25171034163f9e62f20254f.tar.gz | |
CMakeLists: respect existing CMAKE_C/CXX_FLAGS
Instead of replacing the existing CMAKE_C_FLAGS and CMAKE_CXX_FLAGS, extend
them so that existing assignments (from e.g. toolchain files) are preserved.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0af63c1e..7f43fa27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,8 +88,8 @@ elseif (COMPILER STREQUAL "CLANG") elseif (COMPILER STREQUAL "ICC") set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E") endif () -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") |