wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up include_directories calls

Browse Source 
Remove unnecessary calls

Convert necessary calls to target_include_directories
remotes/origin/work/schwarzer/update_platform_name
Nicolas Fella 5 years ago
parent 7c9322ad7a
commit 7d15dc1ae6
14 changed files with 5 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      generators/chm/CMakeLists.txt
  2. 4
      generators/comicbook/CMakeLists.txt
  3. 7
      generators/djvu/CMakeLists.txt
  4. 4
      generators/dvi/CMakeLists.txt
  5. 6
      generators/epub/CMakeLists.txt
  6. 5
      generators/fax/CMakeLists.txt
  7. 5
      generators/fictionbook/CMakeLists.txt
  8. 6
      generators/kimgio/CMakeLists.txt
  9. 5
      generators/markdown/CMakeLists.txt
  10. 6
      generators/plucker/CMakeLists.txt
  11. 7
      generators/spectre/CMakeLists.txt
  12. 5
      generators/tiff/CMakeLists.txt
  13. 4
      generators/txt/CMakeLists.txt
  14. 5
      generators/xps/CMakeLists.txt

9
generators/chm/CMakeLists.txt
Unescape View File

@ -3,14 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_chm")
add_subdirectory( kio-msits ) add_subdirectory( kio-msits )
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
${CHM_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/lib
${LIBZIP_INCLUDE_DIR}
)
########### next target ############### ########### next target ###############
set(okularGenerator_chmlib_SRCS set(okularGenerator_chmlib_SRCS
@ -28,6 +20,7 @@ set(okularGenerator_chmlib_SRCS
) )
okular_add_generator(okularGenerator_chmlib ${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) target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
########### autotests ############### ########### autotests ###############

4
generators/comicbook/CMakeLists.txt
Unescape View File

@ -1,10 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_comicbook") add_definitions(-DTRANSLATION_DOMAIN="okular_comicbook")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set( okularGenerator_comicbook_PART_SRCS set( okularGenerator_comicbook_PART_SRCS

7
generators/djvu/CMakeLists.txt
Unescape View File

@ -1,12 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_djvu") add_definitions(-DTRANSLATION_DOMAIN="okular_djvu")
include_directories(
${DJVULIBRE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_djvu_SRCS set(okularGenerator_djvu_SRCS
@ -17,6 +11,7 @@ set(okularGenerator_djvu_SRCS
okular_add_generator(okularGenerator_djvu ${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) target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF5::I18n)
########### install files ############### ########### install files ###############

4
generators/dvi/CMakeLists.txt
Unescape View File

@ -1,10 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_dvi") add_definitions(-DTRANSLATION_DOMAIN="okular_dvi")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
#add_definitions(-DDEBUG_DVIRENDERER -DDEBUG_RENDER -DDEBUG_PRESCAN -DDEBUG_PSGS -DDEBUG_FONTPOOL) #add_definitions(-DDEBUG_DVIRENDERER -DDEBUG_RENDER -DDEBUG_PRESCAN -DDEBUG_PSGS -DDEBUG_FONTPOOL)
if (FREETYPE_FOUND) if (FREETYPE_FOUND)

6
generators/epub/CMakeLists.txt
Unescape View File

@ -3,11 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_epub")
add_subdirectory(data) add_subdirectory(data)
include_directories(
${EPUB_INCLUDE_DIR}
)
########### next target ############### ########### next target ###############
set(okularGenerator_epub_PART_SRCS set(okularGenerator_epub_PART_SRCS
@ -18,6 +13,7 @@ set(okularGenerator_epub_PART_SRCS
okular_add_generator(okularGenerator_epub ${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) target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::I18n Qt5::Widgets Qt5::Xml)

5
generators/fax/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_fax") add_definitions(-DTRANSLATION_DOMAIN="okular_fax")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_fax_PART_SRCS generator_fax.cpp faxdocument.cpp faxexpand.cpp faxinit.cpp fax_debug.cpp) set(okularGenerator_fax_PART_SRCS generator_fax.cpp faxdocument.cpp faxexpand.cpp faxinit.cpp fax_debug.cpp)

5
generators/fictionbook/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_fictionbook") add_definitions(-DTRANSLATION_DOMAIN="okular_fictionbook")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_fb_PART_SRCS set(okularGenerator_fb_PART_SRCS

6
generators/kimgio/CMakeLists.txt
Unescape View File

@ -1,12 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_kimgio") add_definitions(-DTRANSLATION_DOMAIN="okular_kimgio")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
${CMAKE_BINARY_DIR}
)
########### next target ############### ########### next target ###############
okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)

5
generators/markdown/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_markdown") add_definitions(-DTRANSLATION_DOMAIN="okular_markdown")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_md_PART_SRCS set(okularGenerator_md_PART_SRCS

6
generators/plucker/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_plucker") add_definitions(-DTRANSLATION_DOMAIN="okular_plucker")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
${CMAKE_CURRENT_SOURCE_DIR}/../../generators/plucker/unpluck
)
set(qunpluck_SRCS set(qunpluck_SRCS
unpluck/config.cpp unpluck/config.cpp
unpluck/image.cpp unpluck/image.cpp
@ -22,6 +17,7 @@ set(okularGenerator_plucker_SRCS
okular_add_generator(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_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) target_link_libraries(okularGenerator_plucker okularcore KF5::KIOCore KF5::I18n ${MATH_LIB} JPEG::JPEG ZLIB::ZLIB)
########### install files ############### ########### install files ###############

7
generators/spectre/CMakeLists.txt
Unescape View File

@ -3,12 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_ghostview")
add_subdirectory( conf ) add_subdirectory( conf )
include_directories(
${LIBSPECTRE_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../..
${CMAKE_CURRENT_BINARY_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_ghostview_SRCS 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}) 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) target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml)
########### install files ############### ########### install files ###############

5
generators/tiff/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_tiff") add_definitions(-DTRANSLATION_DOMAIN="okular_tiff")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_tiff_SRCS set(okularGenerator_tiff_SRCS

4
generators/txt/CMakeLists.txt
Unescape View File

@ -1,10 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_txt") add_definitions(-DTRANSLATION_DOMAIN="okular_txt")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_txt_SRCS set(okularGenerator_txt_SRCS

5
generators/xps/CMakeLists.txt
Unescape View File

@ -1,11 +1,6 @@
remove_definitions(-DTRANSLATION_DOMAIN="okular") remove_definitions(-DTRANSLATION_DOMAIN="okular")
add_definitions(-DTRANSLATION_DOMAIN="okular_xps") add_definitions(-DTRANSLATION_DOMAIN="okular_xps")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../..
)
########### next target ############### ########### next target ###############
set(okularGenerator_xps_SRCS set(okularGenerator_xps_SRCS

Write Preview
Loading…
Cancel
Save