summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Popov <6yearold@gmail.com>2015-10-25 13:46:46 (GMT)
committerPatrick Spendrin <ps_ml@gmx.de>2015-12-16 00:24:45 (GMT)
commit355d592bfb6a817ce537f1b39a82ba7b0c4e99ca (patch)
treee83e52d8e2551b2aa9b88985276f0ab29b557606
parent0928298a74087f1a42fc53f5eca35d0315d36c22 (diff)
Fix compilation of fax and comicbook generators with MSVC 2015.
REVIEW: 125791
-rw-r--r--generators/comicbook/CMakeLists.txt4
-rw-r--r--generators/fax/faxexpand.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
index deed292..684613b 100644
--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@@ -16,10 +16,10 @@ set( okularGenerator_comicbook_PART_SRCS
add_library(okularGenerator_comicbook MODULE ${okularGenerator_comicbook_PART_SRCS})
-target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore)
+target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Archive KF5::KDELibs4Support)
if (UNIX)
find_package(KF5 REQUIRED Pty)
- target_link_libraries(okularGenerator_comicbook KF5::Pty KF5::I18n KF5::Archive KF5::KDELibs4Support)
+ target_link_libraries(okularGenerator_comicbook KF5::Pty)
endif (UNIX)
install(TARGETS okularGenerator_comicbook DESTINATION ${KDE_INSTALL_PLUGINDIR})
diff --git a/generators/fax/faxexpand.h b/generators/fax/faxexpand.h
index f062974..21f5bbd 100644
--- a/generators/fax/faxexpand.h
+++ b/generators/fax/faxexpand.h
@@ -22,7 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
#define _faxexpand_h_
#include <sys/types.h>
+#ifndef Q_OS_WIN
#include <unistd.h>
+#endif
#include <QtGui/QImage>