diff --git a/CMakeLists.txt b/CMakeLists.txt index bcfe74f7f..7f4ac65d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ else(NOT WIN32) set(MATH_LIB) endif(NOT WIN32) include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/okular/ui/painter_agg2/ + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/ui/painter_agg2/ ) diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index d1ee6dc98..daf9e67d7 100644 --- a/generators/chm/CMakeLists.txt +++ b/generators/chm/CMakeLists.txt @@ -1,25 +1,25 @@ add_subdirectory( kio-msits ) include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_BINARY_DIR}/okular ${CHM_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib ) ########### next target ############### set(chmlib_SRCS - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib/iconstorage.cpp - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib/kchmtextencoding.cpp - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib/kchmtreeviewitem.cpp - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib/kchmurl.cpp - ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib/xchmfile.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib/iconstorage.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib/kchmtextencoding.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib/kchmtreeviewitem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib/kchmurl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/lib/xchmfile.cpp ) set(okularGenerator_chmlib_SRCS - ${CMAKE_SOURCE_DIR}/okular/generators/chm/generator_chm.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/chm/generator_chm.cpp ) set(okularGenerator_chmlib_PART_SRCS ${chmlib_SRCS} ${okularGenerator_chmlib_SRCS} ) diff --git a/generators/chm/kio-msits/CMakeLists.txt b/generators/chm/kio-msits/CMakeLists.txt index 1486724cd..f597c6192 100644 --- a/generators/chm/kio-msits/CMakeLists.txt +++ b/generators/chm/kio-msits/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CHM_INCLUDE_DIR} ) diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt index a9e3de914..1cc9b1838 100644 --- a/generators/comicbook/CMakeLists.txt +++ b/generators/comicbook/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ) diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt index 2aa80ab97..31bd24859 100644 --- a/generators/djvu/CMakeLists.txt +++ b/generators/djvu/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${DJVULIBRE_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_BINARY_DIR}/okular ) diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt index 9390b3481..b11a87e86 100644 --- a/generators/dvi/CMakeLists.txt +++ b/generators/dvi/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_BINARY_DIR}/okular ) diff --git a/generators/fictionbook/CMakeLists.txt b/generators/fictionbook/CMakeLists.txt index 15ea03446..2e983efc6 100644 --- a/generators/fictionbook/CMakeLists.txt +++ b/generators/fictionbook/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${CMAKE_BINARY_DIR}/okular - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ) diff --git a/generators/ghostview/CMakeLists.txt b/generators/ghostview/CMakeLists.txt index 38fcc3dd4..31705f79b 100644 --- a/generators/ghostview/CMakeLists.txt +++ b/generators/ghostview/CMakeLists.txt @@ -1,9 +1,9 @@ add_subdirectory( conf ) include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_BINARY_DIR}/../.. - ${CMAKE_SOURCE_DIR}/libqgs + ${CMAKE_CURRENT_SOURCE_DIR}/../../libqgs ) add_definitions(${KDE4_ENABLE_EXCEPTIONS}) diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt index 75487029a..0c23e8f7d 100644 --- a/generators/kimgio/CMakeLists.txt +++ b/generators/kimgio/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ) diff --git a/generators/ooo/CMakeLists.txt b/generators/ooo/CMakeLists.txt index a656bae8a..19e79eece 100644 --- a/generators/ooo/CMakeLists.txt +++ b/generators/ooo/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${CMAKE_BINARY_DIR}/okular - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ) diff --git a/generators/plucker/CMakeLists.txt b/generators/plucker/CMakeLists.txt index db5518f6e..5b7edbc62 100644 --- a/generators/plucker/CMakeLists.txt +++ b/generators/plucker/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories( ${CMAKE_BINARY_DIR}/okular - ${CMAKE_SOURCE_DIR}/okular - ${CMAKE_SOURCE_DIR}/okular/generators/plucker/unpluck + ${CMAKE_CURRENT_SOURCE_DIR}/../.. + ${CMAKE_CURRENT_SOURCE_DIR}/../../generators/plucker/unpluck ${JPEG_INCLUDE_DIR} ) diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt index 00ff882c6..2f80a977e 100644 --- a/generators/poppler/CMakeLists.txt +++ b/generators/poppler/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories( ${POPPLER_INCLUDE_DIR}/poppler ${CMAKE_BINARY_DIR}/okular - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ) diff --git a/generators/tiff/CMakeLists.txt b/generators/tiff/CMakeLists.txt index 599ac84ab..a661ef3a5 100644 --- a/generators/tiff/CMakeLists.txt +++ b/generators/tiff/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${TIFF_INCLUDE_DIR} ) diff --git a/generators/xps/CMakeLists.txt b/generators/xps/CMakeLists.txt index 45eaf2534..316ca0259 100644 --- a/generators/xps/CMakeLists.txt +++ b/generators/xps/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories( - ${CMAKE_SOURCE_DIR}/okular + ${CMAKE_CURRENT_SOURCE_DIR}/../.. )