Make it possible to compile all of playground in one go (but also still to compile it like before, of course).

-> CMAKE_SOURCE_DIR replaced with CMAKE_CURRENT_SOURCE_DIR. Remove module-wide config.h files, unused yet, but better remove the temptation. svn path=/trunk/playground/graphics/okular/; revision=647336
19 years ago · 06d18ea3cc
parent a54af96ed8
commit 06d18ea3cc
14 changed files with 24 additions and 24 deletions
--- 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/
 )


--- 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} )
--- 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}
 )

--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@ -1,5 +1,5 @@
 include_directories(
-   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )


--- 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
 )

--- 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
 )

--- 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}/../..
 )


--- 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})
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@ -1,5 +1,5 @@
 include_directories(
-   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )


--- 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}/../..
 )


--- 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}
 )

--- 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}/../..
 )


--- 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}
 )

--- a/generators/xps/CMakeLists.txt
+++ b/generators/xps/CMakeLists.txt
@ -1,5 +1,5 @@
 include_directories(
-   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_CURRENT_SOURCE_DIR}/../..
 )