From 3298260f11c3cd2bf15727238708ea36999e64cc Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 23 Aug 2020 11:27:02 +0100 Subject: [PATCH] GDAL is a public dependency :( --- SimGearConfig.cmake.in | 4 ++++ simgear/CMakeLists.txt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SimGearConfig.cmake.in b/SimGearConfig.cmake.in index 7382c13f..7ca03d52 100644 --- a/SimGearConfig.cmake.in +++ b/SimGearConfig.cmake.in @@ -32,6 +32,10 @@ endif(ENABLE_RTI) # Alternative terrain engine based on pagedLOD set(ENABLE_GDAL @ENABLE_GDAL@) +if (ENABLE_GDAL) + find_dependency(GDAL) +endif() + set(ENABLE_OPENMP @ENABLE_OPENMP@) include("${CMAKE_CURRENT_LIST_DIR}/SimGearTargets.cmake") diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt index a70b9d7f..e62d04ac 100644 --- a/simgear/CMakeLists.txt +++ b/simgear/CMakeLists.txt @@ -168,7 +168,9 @@ if(NOT SIMGEAR_HEADLESS) ${JPEG_LIBRARY}) if(ENABLE_GDAL) - target_link_libraries(SimGearScene PRIVATE GDAL::GDAL) + # FIXME: should be RIVATE, but we leak GDAL headers + # in our own headers :( + target_link_libraries(SimGearScene PUBLIC GDAL::GDAL) endif() # only actually needed by canvas/KeyboardEvent.cxx