commit e30054f5a0ea124bfeafe71280053e2046734455
author Matthew Bentham <matthew.bentham@arm.com> Mon Jun 24 13:10:54 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Jun 26 08:00:03 2019 +0000
tree 23077a3c47adfa06bd1a4195811d0554602d90d2
parent e0dbedfa9fad91c94ae610c48057fc7c24ceb0d4

Don't override compiler options specified on command line

Change-Id: Id004415afe70c1b4c97ede2da2613edbb9b4e064
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

cmake/GlobalConfig.cmake

diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake
index 0476f40..39926c0 100644
--- a/cmake/GlobalConfig.cmake
+++ b/cmake/GlobalConfig.cmake
@@ -62,7 +62,7 @@
 endif()
 
 # Compiler flags for Release builds
-set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
 if(COMPILER_IS_GNU_LIKE)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
@@ -71,9 +71,9 @@
 
 # Compiler flags for Debug builds
 if(COMPILER_IS_GNU_LIKE)
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
-    set(CMAKE_CXX_FLAGS_DEBUG "/MDd /ZI /Od")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd /ZI /Od")
     # Disable SAFESEH which is necessary for Edit and Continue to work
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG  "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /SAFESEH:NO")
     set(CMAKE_SHARED_LINKER_FLAGS_DEBUG  "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /SAFESEH:NO")