CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
New commits: commit aa0f0d718300b4244e0b662f391552d6d91dd84f Author: Albert Astals Cid <[email protected]> Date: Wed Jul 17 17:45:12 2019 +0200 cmake: Mark external lib include dirs as SYSTEM this way -isystem is used instead of -I which is the correct thing to do diff --git a/CMakeLists.txt b/CMakeLists.txt index 265008a7..7001544c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,7 +228,7 @@ endif() if(ENABLE_LIBCURL) find_package(CURL) if(CURL_FOUND) - include_directories(${CURL_INCLUDE_DIR}) + include_directories(SYSTEM ${CURL_INCLUDE_DIR}) set(POPPLER_HAS_CURL_SUPPORT ON) else() set(ENABLE_LIBCURL OFF) @@ -241,7 +241,7 @@ if(MINGW) endif() if(FONTCONFIG_FOUND) add_definitions(${FONTCONFIG_DEFINITIONS}) - include_directories(${FONTCONFIG_INCLUDE_DIR}) + include_directories(SYSTEM ${FONTCONFIG_INCLUDE_DIR}) endif() if(WITH_FONTCONFIGURATION_WIN32) if(MINGW) @@ -256,11 +256,12 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/poppler ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/poppler + SYSTEM ${FREETYPE_INCLUDE_DIRS} ) if(ENABLE_ZLIB) - include_directories(${ZLIB_INCLUDE_DIR}) + include_directories(SYSTEM ${ZLIB_INCLUDE_DIR}) endif() if (NSS3_FOUND) @@ -268,21 +269,21 @@ if (NSS3_FOUND) set(ENABLE_NSS3 ON) endif() if(JPEG_FOUND) - include_directories(${JPEG_INCLUDE_DIR}) + include_directories(SYSTEM ${JPEG_INCLUDE_DIR}) endif() if(PNG_FOUND) - include_directories(${PNG_INCLUDE_DIR}) + include_directories(SYSTEM ${PNG_INCLUDE_DIR}) set(ENABLE_LIBPNG ON) endif() if(TIFF_FOUND) - include_directories(${TIFF_INCLUDE_DIR}) + include_directories(SYSTEM ${TIFF_INCLUDE_DIR}) set(ENABLE_LIBTIFF ON) endif() if(OpenJPEG_FOUND) - include_directories(${OPENJPEG_INCLUDE_DIRS}) + include_directories(SYSTEM ${OPENJPEG_INCLUDE_DIRS}) endif() if(LCMS2_FOUND) - include_directories(${LCMS2_INCLUDE_DIR}) + include_directories(SYSTEM ${LCMS2_INCLUDE_DIR}) endif() # Recent versions of poppler-data install a .pc file. _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
