[ptxdist] [PATCH] toolchain-target.cmake.in: fix system includes

[ptxdist] [PATCH] toolchain-target.cmake.in: fix system includes

[Andreas Bießmann]

When playing around with xenomai we found out that the additional added
xenomai includes had lower priority than the system includes (concrete the
PTXDIST_PATH_SYSROOT_PREFIX).  This is due to the ptxdist cmake adoption did
not export sysroot include path as system include path. To ensure a higher
priority than other 'system includes' append the ptxdist sysroot includes at
the topmost place in the system includes search path.

Signed-off-by: Tim Niemeyer <tim.niemeyer@corscience.de>
Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
---
 config/cmake/toolchain-target.cmake.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cmake/toolchain-target.cmake.in b/config/cmake/toolchain-target.cmake.in
index d316db5..6029e40 100644
--- a/config/cmake/toolchain-target.cmake.in
+++ b/config/cmake/toolchain-target.cmake.in
@@ -17,7 +17,7 @@ SET(CMAKE_CXX_COMPILER			@CXX@)
 SET(CMAKE_FIND_ROOT_PATH		@SYSROOT@)
 
 # additional search directories
-include_directories(			@INCLUDE_DIRECTORIES@)
+include_directories(BEFORE SYSTEM	@INCLUDE_DIRECTORIES@)
 link_directories(			@LINK_DIRECTORIES@)
 
 # search for programs in the build host directories
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] toolchain-target.cmake.in: fix system includes

[Michael Olbrich]

On Wed, Dec 12, 2012 at 03:12:37PM +0100, Andreas Bießmann wrote:
> When playing around with xenomai we found out that the additional added
> xenomai includes had lower priority than the system includes (concrete the
> PTXDIST_PATH_SYSROOT_PREFIX).  This is due to the ptxdist cmake adoption did
> not export sysroot include path as system include path. To ensure a higher
> priority than other 'system includes' append the ptxdist sysroot includes at
> the topmost place in the system includes search path.
> 
> Signed-off-by: Tim Niemeyer <tim.niemeyer@corscience.de>
> Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
> ---
>  config/cmake/toolchain-target.cmake.in |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/config/cmake/toolchain-target.cmake.in b/config/cmake/toolchain-target.cmake.in
> index d316db5..6029e40 100644
> --- a/config/cmake/toolchain-target.cmake.in
> +++ b/config/cmake/toolchain-target.cmake.in
> @@ -17,7 +17,7 @@ SET(CMAKE_CXX_COMPILER			@CXX@)
>  SET(CMAKE_FIND_ROOT_PATH		@SYSROOT@)
>  
>  # additional search directories
> -include_directories(			@INCLUDE_DIRECTORIES@)
> +include_directories(BEFORE SYSTEM	@INCLUDE_DIRECTORIES@)
>  link_directories(			@LINK_DIRECTORIES@)

I think with the latest changes in PTXdist these lines should be completely
removed.

Michael

>  # search for programs in the build host directories
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de