From 3f8c3c32ea9b1947498c898c2af97cd2b2f50c8c Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Sun, 8 Jul 2018 23:16:27 +0300 Subject: [PATCH] Fix #7766: Found ICU include directories being unused (#7767) When ICU is installed separately from the system and paths configured in CMake then the detected include directories should also be used for compilation instead of blindly using unconfigured system includes. SYSTEM flag ignores suggest-override warnings in ICU headers. --- src/openrct2/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt index 7ffb8e11fe..b7bfd67ba6 100644 --- a/src/openrct2/CMakeLists.txt +++ b/src/openrct2/CMakeLists.txt @@ -162,6 +162,9 @@ if (NOT DISABLE_TTF) target_include_directories(${PROJECT} PRIVATE ${FONTCONFIG_INCLUDE_DIRS}) endif () endif () +if (NOT MINGW AND NOT MSVC) + target_include_directories(${PROJECT} SYSTEM PRIVATE ${ICU_INCLUDE_DIRS}) +endif () # To avoid unnecessary rebuilds set the current branch and # short sha1 only for the two files that use these