FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge /u/gallaert/simgear/ branch next into next

Browse Source 
https://sourceforge.net/p/flightgear/simgear/merge-requests/38/
This commit is contained in:
James Turner
2017-08-18 22:25:48 +00:00
parent 27786d709d e0e6a29150
commit 1aba20d642
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+14 -6
View File
@@ -249,8 +249,8 @@ else()
# declaring symbols as declspec(import) # declaring symbols as declspec(import)
add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC) add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC)
set(EXPAT_INCLUDE_DIRS set(EXPAT_INCLUDE_DIRS
${PROJECT_SOURCE_DIR}/3rdparty/expat ${PROJECT_SOURCE_DIR}/3rdparty/expat
${PROJECT_BINARY_DIR}/3rdparty/expat) ${PROJECT_BINARY_DIR}/3rdparty/expat)
endif(SYSTEM_EXPAT) endif(SYSTEM_EXPAT)
check_include_file(inttypes.h HAVE_INTTYPES_H) check_include_file(inttypes.h HAVE_INTTYPES_H)
@@ -264,9 +264,17 @@ if(HAVE_INTTYPES_H)
endif() endif()
if(ENABLE_RTI) if(ENABLE_RTI)
# See if we have any rti library variant installed find_package(PkgConfig)
message(STATUS "RTI: ENABLED") if(PKG_CONFIG_FOUND)
find_package(RTI) SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
pkg_check_modules(RTI hla-rti13)
endif(PKG_CONFIG_FOUND)
if(RTI_FOUND)
SET(RTI_INCLUDE_DIR "${RTI_INCLUDE_DIRS}")
message(STATUS "RTI: ENABLED")
else()
message(STATUS "RTI: DISABLED")
endif(RTI_FOUND)
else() else()
message(STATUS "RTI: DISABLED") message(STATUS "RTI: DISABLED")
endif(ENABLE_RTI) endif(ENABLE_RTI)
@@ -274,7 +282,7 @@ endif(ENABLE_RTI)
if(ENABLE_GDAL) if(ENABLE_GDAL)
find_package(GDAL 2.0.0 REQUIRED) find_package(GDAL 2.0.0 REQUIRED)
if (GDAL_FOUND) if (GDAL_FOUND)
include_directories(${GDAL_INCLUDE_DIR}) include_directories(${GDAL_INCLUDE_DIR})
endif(GDAL_FOUND) endif(GDAL_FOUND)
endif(ENABLE_GDAL) endif(ENABLE_GDAL)