[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okular/frameworks] generators: Fix compilation of fax and comicbook generators with MSVC 2015.
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-16 0:27:33
Message-ID: E1a8zwL-0002hR-Br () scm ! kde ! org
[Download RAW message or body]

Git commit 355d592bfb6a817ce537f1b39a82ba7b0c4e99ca by Patrick Spendrin, on behalf of \
Gleb Popov. Committed on 16/12/2015 at 00:24.
Pushed by sengels into branch 'frameworks'.

Fix compilation of fax and comicbook generators with MSVC 2015.

REVIEW: 125791

M  +2    -2    generators/comicbook/CMakeLists.txt
M  +2    -0    generators/fax/faxexpand.h

http://commits.kde.org/okular/355d592bfb6a817ce537f1b39a82ba7b0c4e99ca

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>
 


[prev in list] [next in list] [prev in thread] [next in thread]