diff options
| author | Florian Schmaus <flo@geekplace.eu> | 2017-05-19 08:59:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-19 14:51:09 (GMT) |
| commit | 47732280619c188da05ce5fa13527714cbe65b91 (patch) | |
| tree | c4c3e3362024b45b00dcb31dc394adf4b8a200bf /Modules | |
| parent | bc7d64f896d6e180970cb404cc7699732db34adc (diff) | |
| download | CMake-47732280619c188da05ce5fa13527714cbe65b91.zip CMake-47732280619c188da05ce5fa13527714cbe65b91.tar.gz CMake-47732280619c188da05ce5fa13527714cbe65b91.tar.bz2 | |
UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders
Update the module to account for commit v3.4.0-rc1~342^2 (Factor an
<INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13)
and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and
source files, 2008-01-14).
Fixes: #16904
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}") |