mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Simmo Saan 2018-07-08 23:16:27 +03:00 committed by Michał Janiszewski
parent 66bfd42551
commit 3f8c3c32ea
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/CMakeLists.txt
View File

@ -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