fly/flightgear
1
0
Fork 0
Code Activity

CMake: add UTF8-CPP to SimGear include directories.

Browse source
This commit is contained in:
Thomas Geymayer 2014-07-30 12:47:33 +02:00
parent 49df413444
commit a948f68960
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -334,7 +334,7 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
${OPENAL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}
${SIMGEAR_INCLUDE_DIR} ${SIMGEAR_INCLUDE_DIRS}
${PLIB_INCLUDE_DIR} ${PLIB_INCLUDE_DIR}
${SQLITE3_INCLUDED_DIR} ) ${SQLITE3_INCLUDED_DIR} )

10
CMakeModules/FindSimGear.cmake
View file

@ -4,7 +4,7 @@
# SIMGEAR_CORE_LIBRARIES, a list of the core static libraries # SIMGEAR_CORE_LIBRARIES, a list of the core static libraries
# SIMGEAR_LIBRARIES, a list of all the static libraries (core + scene) # SIMGEAR_LIBRARIES, a list of all the static libraries (core + scene)
# SIMGEAR_FOUND, if false, do not try to link to SimGear # SIMGEAR_FOUND, if false, do not try to link to SimGear
# SIMGEAR_INCLUDE_DIR, where to find the headers # SIMGEAR_INCLUDE_DIRS, where to find the headers
# #
# $SIMGEAR_DIR is an environment variable that would # $SIMGEAR_DIR is an environment variable that would
# correspond to the ./configure --prefix=$SIMGEAR_DIR # correspond to the ./configure --prefix=$SIMGEAR_DIR
@ -180,7 +180,11 @@ endif()
# now we've found SimGear, try test-compiling using its includes # now we've found SimGear, try test-compiling using its includes
include(CheckCXXSourceRuns) include(CheckCXXSourceRuns)
SET(CMAKE_REQUIRED_INCLUDES ${SIMGEAR_INCLUDE_DIR}) set(SIMGEAR_INCLUDE_DIRS
${SIMGEAR_INCLUDE_DIR}
${SIMGEAR_INCLUDE_DIR}/simgear/3rdparty/utf8
)
SET(CMAKE_REQUIRED_INCLUDES ${SIMGEAR_INCLUDE_DIRS})
# clear cache, run a fresh compile test every time # clear cache, run a fresh compile test every time
unset(SIMGEAR_COMPILE_TEST CACHE) unset(SIMGEAR_COMPILE_TEST CACHE)
@ -226,5 +230,5 @@ unset(CMAKE_REQUIRED_DEFINITIONS)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SimGear DEFAULT_MSG FIND_PACKAGE_HANDLE_STANDARD_ARGS(SimGear DEFAULT_MSG
SIMGEAR_LIBRARIES SIMGEAR_CORE_LIBRARIES SIMGEAR_INCLUDE_DIR SIMGEAR_COMPILE_TEST) SIMGEAR_LIBRARIES SIMGEAR_CORE_LIBRARIES SIMGEAR_INCLUDE_DIRS SIMGEAR_COMPILE_TEST)