diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-22 14:35:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-22 14:35:59 (GMT) |
| commit | a152e97e2354a0396ab8f8433d61e8f8da7da7f5 (patch) | |
| tree | 8508e3319ad76442dfaa643d6d874ab1c7cba8ff /Modules | |
| parent | a748916f5e14687e31d2bd6d7dab5a8d5b7aa2b3 (diff) | |
| parent | 47732280619c188da05ce5fa13527714cbe65b91 (diff) | |
| download | CMake-a152e97e2354a0396ab8f8433d61e8f8da7da7f5.zip CMake-a152e97e2354a0396ab8f8433d61e8f8da7da7f5.tar.gz CMake-a152e97e2354a0396ab8f8433d61e8f8da7da7f5.tar.bz2 | |
Merge topic 'UseEcos-update'
47732280 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !871
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 be1dfd1..942bc38 100644 --- a/Modules/UseEcos.cmake +++ b/Modules/UseEcos.cmake @@ -184,8 +184,8 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME ) # when using nmake makefiles, the custom buildtype supresses the default cl.exe flags # and the rules for creating objects are adjusted for gcc set(CMAKE_BUILD_TYPE CUSTOM_ECOS_BUILD) - set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>") - set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>") + set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>") + set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>") # special link commands for ecos-executables 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}") |