fly/flightgear
1
0
Fork 0
Code Activity

Fix to manage the case where SimGear include files are obtained via CMAKE_PREFIX_PATH

Browse source
This commit is contained in:
Bertrand Coconnier 2017-02-05 10:27:30 +01:00
parent 044715ba05
commit 93a8ab99ff
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -359,9 +359,14 @@ endif(ENABLE_RTI)
# Check if the flag ENABLE_SIMD was enabled during the compilation of SimGear. # 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. # The same value has to be carried over for FlightGear to prevent crashes.
set(INCLUDE_DIRECTORIES "${SIMGEAR_INCLUDE_DIRS}")
foreach(dir ${CMAKE_PREFIX_PATH})
set(INCLUDE_DIRECTORIES "${dir}/include;${INCLUDE_DIRECTORIES}")
endforeach()
try_run(ENABLE_SIMD COMPILE_RESULT_TEST_SIMD ${CMAKE_CURRENT_BINARY_DIR} try_run(ENABLE_SIMD COMPILE_RESULT_TEST_SIMD ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/tests/test-simd-enabled.c ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-simd-enabled.c
CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${SIMGEAR_INCLUDE_DIRS}") CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${INCLUDE_DIRECTORIES}")
if (COMPILE_RESULT_TEST_SIMD AND ENABLE_SIMD if (COMPILE_RESULT_TEST_SIMD AND ENABLE_SIMD
AND NOT (ENABLE_SIMD EQUAL FAILED_TO_RUN)) AND NOT (ENABLE_SIMD EQUAL FAILED_TO_RUN))