Skip to content

Commit

Permalink
Merge pull request #114 from daniel-formlabs/dont-overwrite-cmake-cxx…
Browse files Browse the repository at this point in the history
…-flags

Don't completely overwrite the CMAKE_CXX_FLAGS
  • Loading branch information
pavel-kirienko authored Nov 21, 2017
2 parents d577c58 + 337fdff commit fa6dbde
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libuavcan_drivers/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ endif ()
# Applications - tests, tools.
#
include_directories(include)
set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -std=c++11") # GCC or Clang
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11") # GCC or Clang

if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DUAVCAN_DEBUG=1)
Expand Down

0 comments on commit fa6dbde

Please sign in to comment.