From 355d592bfb6a817ce537f1b39a82ba7b0c4e99ca Mon Sep 17 00:00:00 2001 From: Gleb Popov <6yearold@gmail.com> Date: Sun, 25 Oct 2015 16:46:46 +0300 Subject: [PATCH] Fix compilation of fax and comicbook generators with MSVC 2015. REVIEW: 125791 --- generators/comicbook/CMakeLists.txt | 4 ++-- generators/fax/faxexpand.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt index deed292fd..684613b5b 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 f0629746c..21f5bbd79 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 +#ifndef Q_OS_WIN #include +#endif #include