From 80b8a298e10c6a0cc35bbdfa82fa5a988e6ed558 Mon Sep 17 00:00:00 2001 From: Bertrand Coconnier Date: Sat, 4 Feb 2017 21:53:18 +0100 Subject: [PATCH] Fix for when SimGear headers are not installed system wide (as is the case for Jenkins) --- CMakeLists.txt | 2 +- tests/test-simd-enabled.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85df27fa1..028e9664b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,6 +359,7 @@ endif(ENABLE_RTI) # Check if the flag ENABLE_SIMD was enabled during the compilation of SimGear. # The same value has to be carried over for FlightGear to prevent crashes. +include_directories(${SIMGEAR_INCLUDE_DIRS}) try_run(ENABLE_SIMD COMPILE_RESULT_TEST_SIMD ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-simd-enabled.c) @@ -447,7 +448,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}") include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} - ${SIMGEAR_INCLUDE_DIRS} ${PLIB_INCLUDE_DIR} ${SQLITE3_INCLUDED_DIR} ) diff --git a/tests/test-simd-enabled.c b/tests/test-simd-enabled.c index 20d4e9d54..5a6f391ad 100644 --- a/tests/test-simd-enabled.c +++ b/tests/test-simd-enabled.c @@ -1,4 +1,4 @@ -#include +#include "simgear/simgear_config.h" int main(void) { #ifdef ENABLE_SIMD