From e0e6a29150e6f0f93a00ba14e3601d8802b80727 Mon Sep 17 00:00:00 2001 From: gallaert Date: Wed, 16 Aug 2017 21:15:20 +0100 Subject: [PATCH] CMake fails to detect OpenRTI include files. --- CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 419d335d..988dbf8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,8 +249,8 @@ else() # declaring symbols as declspec(import) add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC) set(EXPAT_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/3rdparty/expat - ${PROJECT_BINARY_DIR}/3rdparty/expat) + ${PROJECT_SOURCE_DIR}/3rdparty/expat + ${PROJECT_BINARY_DIR}/3rdparty/expat) endif(SYSTEM_EXPAT) check_include_file(inttypes.h HAVE_INTTYPES_H) @@ -264,9 +264,17 @@ if(HAVE_INTTYPES_H) endif() if(ENABLE_RTI) - # See if we have any rti library variant installed - message(STATUS "RTI: ENABLED") - find_package(RTI) + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) + 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() message(STATUS "RTI: DISABLED") endif(ENABLE_RTI) @@ -274,7 +282,7 @@ endif(ENABLE_RTI) if(ENABLE_GDAL) find_package(GDAL 2.0.0 REQUIRED) if (GDAL_FOUND) - include_directories(${GDAL_INCLUDE_DIR}) + include_directories(${GDAL_INCLUDE_DIR}) endif(GDAL_FOUND) endif(ENABLE_GDAL)