fly/flightgear
1
0
Fork 0
Code Activity

Fix for when SimGear headers are not installed system wide (as is the case for Jenkins)

Browse source
This commit is contained in:
Bertrand Coconnier 2017-02-04 21:53:18 +01:00
parent 4ab0b71fa8
commit 80b8a298e1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -359,6 +359,7 @@ 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.
include_directories(${SIMGEAR_INCLUDE_DIRS})
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)
@ -447,7 +448,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS} include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${SIMGEAR_INCLUDE_DIRS}
${PLIB_INCLUDE_DIR} ${PLIB_INCLUDE_DIR}
${SQLITE3_INCLUDED_DIR} ) ${SQLITE3_INCLUDED_DIR} )

2
tests/test-simd-enabled.c
View file

@ -1,4 +1,4 @@
#include <simgear/simgear_config.h> #include "simgear/simgear_config.h"
int main(void) { int main(void) {
#ifdef ENABLE_SIMD #ifdef ENABLE_SIMD