diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-01-05 15:47:14 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-05 15:51:35 +0100 |
| commit | 10db7e7cfc2be1be783ed6aa44514aea547b6768 (patch) | |
| tree | 808fc52c451a0ccb0a3b5bfc87854dc1a8e51a91 | |
| parent | 7f07ae0885d21091d9c018e84e6088a46639697d (diff) | |
| download | tdegraphics-10db7e7cfc2be1be783ed6aa44514aea547b6768.tar.gz tdegraphics-10db7e7cfc2be1be783ed6aa44514aea547b6768.zip | |
Fix cmake build: kghostview parallel build
This resolves Bug 1301
(cherry picked from commit 923dc5953a93b0db1ba723a4cff040150dabfaaf)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kghostview/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18bb538d..2d345b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,8 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### kdegraphics directories ################### -if( BUILD_KFILE_PLUGINS OR BUILD_GHOSTKVIEW ) +# kfile-plugins/ps requires dscparse-static library +if( BUILD_KFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW ) add_subdirectory( kghostview/dscparse ) endif( ) diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt index e8f8d2a1..ad85ef4f 100644 --- a/kghostview/CMakeLists.txt +++ b/kghostview/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( data ) +add_subdirectory( dscparse ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} |