From 7d15dc1ae67e318fab85d98f53b0632391e8ac85 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sun, 4 Jul 2021 00:51:15 +0200 Subject: [PATCH] Clean up include_directories calls Remove unnecessary calls Convert necessary calls to target_include_directories --- generators/chm/CMakeLists.txt | 9 +-------- generators/comicbook/CMakeLists.txt | 4 ---- generators/djvu/CMakeLists.txt | 7 +------ generators/dvi/CMakeLists.txt | 4 ---- generators/epub/CMakeLists.txt | 6 +----- generators/fax/CMakeLists.txt | 5 ----- generators/fictionbook/CMakeLists.txt | 5 ----- generators/kimgio/CMakeLists.txt | 6 ------ generators/markdown/CMakeLists.txt | 5 ----- generators/plucker/CMakeLists.txt | 6 +----- generators/spectre/CMakeLists.txt | 7 +------ generators/tiff/CMakeLists.txt | 5 ----- generators/txt/CMakeLists.txt | 4 ---- generators/xps/CMakeLists.txt | 5 ----- 14 files changed, 5 insertions(+), 73 deletions(-) diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index 9d82b9394..0d7452cba 100644 --- a/generators/chm/CMakeLists.txt +++ b/generators/chm/CMakeLists.txt @@ -3,14 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_chm") add_subdirectory( kio-msits ) -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CHM_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${LIBZIP_INCLUDE_DIR} -) - - ########### next target ############### set(okularGenerator_chmlib_SRCS @@ -28,6 +20,7 @@ set(okularGenerator_chmlib_SRCS ) okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS}) +target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR}) target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml) ########### autotests ############### diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt index 9a07c7183..a0e7569a2 100644 --- a/generators/comicbook/CMakeLists.txt +++ b/generators/comicbook/CMakeLists.txt @@ -1,10 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_comicbook") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - ########### next target ############### set( okularGenerator_comicbook_PART_SRCS diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt index e44f64a88..7b4ff2b59 100644 --- a/generators/djvu/CMakeLists.txt +++ b/generators/djvu/CMakeLists.txt @@ -1,12 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_djvu") -include_directories( - ${DJVULIBRE_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_djvu_SRCS @@ -17,6 +11,7 @@ set(okularGenerator_djvu_SRCS okular_add_generator(okularGenerator_djvu ${okularGenerator_djvu_SRCS}) +target_include_directories(okularGenerator_djvu PRIVATE ${DJVULIBRE_INCLUDE_DIR}) target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF5::I18n) ########### install files ############### diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt index b2c4506f0..591058cb3 100644 --- a/generators/dvi/CMakeLists.txt +++ b/generators/dvi/CMakeLists.txt @@ -1,10 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_dvi") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - #add_definitions(-DDEBUG_DVIRENDERER -DDEBUG_RENDER -DDEBUG_PRESCAN -DDEBUG_PSGS -DDEBUG_FONTPOOL) if (FREETYPE_FOUND) diff --git a/generators/epub/CMakeLists.txt b/generators/epub/CMakeLists.txt index 1cdd563aa..ae0943db6 100644 --- a/generators/epub/CMakeLists.txt +++ b/generators/epub/CMakeLists.txt @@ -3,11 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_epub") add_subdirectory(data) -include_directories( - ${EPUB_INCLUDE_DIR} -) - - ########### next target ############### set(okularGenerator_epub_PART_SRCS @@ -18,6 +13,7 @@ set(okularGenerator_epub_PART_SRCS okular_add_generator(okularGenerator_epub ${okularGenerator_epub_PART_SRCS}) +target_include_directories(okularGenerator_epub PRIVATE ${EPUB_INCLUDE_DIR}) target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::I18n Qt5::Widgets Qt5::Xml) diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt index d8e9cd07a..d502303c2 100644 --- a/generators/fax/CMakeLists.txt +++ b/generators/fax/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_fax") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_fax_PART_SRCS generator_fax.cpp faxdocument.cpp faxexpand.cpp faxinit.cpp fax_debug.cpp) diff --git a/generators/fictionbook/CMakeLists.txt b/generators/fictionbook/CMakeLists.txt index a52bd9eaa..afaf2b454 100644 --- a/generators/fictionbook/CMakeLists.txt +++ b/generators/fictionbook/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_fictionbook") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_fb_PART_SRCS diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt index db14d741f..cfce143ac 100644 --- a/generators/kimgio/CMakeLists.txt +++ b/generators/kimgio/CMakeLists.txt @@ -1,12 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_kimgio") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_BINARY_DIR} -) - - ########### next target ############### okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) diff --git a/generators/markdown/CMakeLists.txt b/generators/markdown/CMakeLists.txt index 0d1c3036c..a976d350e 100644 --- a/generators/markdown/CMakeLists.txt +++ b/generators/markdown/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_markdown") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_md_PART_SRCS diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt index 4b19efa75..00572cb5d 100644 --- a/generators/plucker/CMakeLists.txt +++ b/generators/plucker/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_plucker") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/plucker/unpluck -) - set(qunpluck_SRCS unpluck/config.cpp unpluck/image.cpp @@ -22,6 +17,7 @@ set(okularGenerator_plucker_SRCS okular_add_generator(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS}) +target_include_directories(okularGenerator_plucker PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/unpluck) target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore KF5::I18n ${MATH_LIB} JPEG::JPEG ZLIB::ZLIB) ########### install files ############### diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt index 5d6927d67..35248cf0f 100644 --- a/generators/spectre/CMakeLists.txt +++ b/generators/spectre/CMakeLists.txt @@ -3,12 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_ghostview") add_subdirectory( conf ) -include_directories( - ${LIBSPECTRE_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/../.. - ${CMAKE_CURRENT_BINARY_DIR}/../.. -) - ########### next target ############### set(okularGenerator_ghostview_SRCS @@ -26,6 +20,7 @@ kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc ) okular_add_generator(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS}) +target_include_directories(okularGenerator_ghostview PRIVATE ${LIBSPECTRE_INCLUDE_DIR}) target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml) ########### install files ############### diff --git a/generators/tiff/CMakeLists.txt b/generators/tiff/CMakeLists.txt index 82c3ab216..75d46c3b4 100644 --- a/generators/tiff/CMakeLists.txt +++ b/generators/tiff/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_tiff") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_tiff_SRCS diff --git a/generators/txt/CMakeLists.txt b/generators/txt/CMakeLists.txt index 709771d96..a80d4bd9c 100644 --- a/generators/txt/CMakeLists.txt +++ b/generators/txt/CMakeLists.txt @@ -1,10 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_txt") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - ########### next target ############### set(okularGenerator_txt_SRCS diff --git a/generators/xps/CMakeLists.txt b/generators/xps/CMakeLists.txt index a71ec9e78..5dc76248c 100644 --- a/generators/xps/CMakeLists.txt +++ b/generators/xps/CMakeLists.txt @@ -1,11 +1,6 @@ remove_definitions(-DTRANSLATION_DOMAIN="okular") add_definitions(-DTRANSLATION_DOMAIN="okular_xps") -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../.. -) - - ########### next target ############### set(okularGenerator_xps_SRCS