Commit 7d15dc1a authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Clean up include_directories calls

Remove unnecessary calls

Convert necessary calls to target_include_directories
parent 7c9322ad
Pipeline #68522 passed with stage
in 9 minutes and 19 seconds
......@@ -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 ###############
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_comicbook")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set( okularGenerator_comicbook_PART_SRCS
......
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 ###############
......
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)
......
......@@ -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)
......
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)
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_fictionbook")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set(okularGenerator_fb_PART_SRCS
......
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)
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_markdown")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set(okularGenerator_md_PART_SRCS
......
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 ###############
......
......@@ -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 ###############
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_tiff")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set(okularGenerator_tiff_SRCS
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_txt")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set(okularGenerator_txt_SRCS
......
remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_xps")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ###############
set(okularGenerator_xps_SRCS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment