diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-07 13:26:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-07 13:26:42 (GMT) |
| commit | e6af2f3d2e754f3cda3581082658443b7f37d9ec (patch) | |
| tree | da1b0ee42f8bbb9ff3f87a367608269539441565 /Modules | |
| parent | 5651bb08786a2a51f389c44f5904f5de777e987b (diff) | |
| parent | 620e4e5e21ca9070e50038c999dfae20cf5416ef (diff) | |
| download | CMake-e6af2f3d2e754f3cda3581082658443b7f37d9ec.zip CMake-e6af2f3d2e754f3cda3581082658443b7f37d9ec.tar.gz CMake-e6af2f3d2e754f3cda3581082658443b7f37d9ec.tar.bz2 | |
Merge topic 'UseEcos-append-flags'
620e4e5e21 UseEcos: Append C and CXX flags instead of overwriting them
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2684
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/UseEcos.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/UseEcos.cmake b/Modules/UseEcos.cmake index 6d13d42..9f84847 100644 --- a/Modules/UseEcos.cmake +++ b/Modules/UseEcos.cmake @@ -191,8 +191,8 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME ) set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}") set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}") # some strict compiler flags - set (CMAKE_C_FLAGS "-Wstrict-prototypes") - set (CMAKE_CXX_FLAGS "-Woverloaded-virtual -fno-rtti -Wctor-dtor-privacy -fno-strict-aliasing -fno-exceptions") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -fno-rtti -Wctor-dtor-privacy -fno-strict-aliasing -fno-exceptions") add_executable(${_exe_NAME} ${ARGN}) set_target_properties(${_exe_NAME} PROPERTIES SUFFIX ".elf") |