From 09795a01ef859f072920de9df974d1b03b9ab9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 28 Dec 2016 20:24:50 +0100 Subject: New upstream version 4.2.4a --- app/wlib/gtklib/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/wlib/gtklib/CMakeLists.txt') diff --git a/app/wlib/gtklib/CMakeLists.txt b/app/wlib/gtklib/CMakeLists.txt index fabc5d8..cce9866 100644 --- a/app/wlib/gtklib/CMakeLists.txt +++ b/app/wlib/gtklib/CMakeLists.txt @@ -1,9 +1,13 @@ + FILE(GLOB HEADERS *.h) +INCLUDE (FindGTKUnixPrint.cmake) + SET(SOURCES gtkbitmap.c gtkbutton.c gtkcolor.c + gtkdraw-cairo.c filesel.c gtkfont.c gtkhelp.c @@ -16,22 +20,18 @@ SET(SOURCES gtktext.c gtkwindow.c gtkxpm.c - psprint.c + print.c wpref.c ) -IF(XTRKCAD_USE_GTK_CAIRO) - SET(SOURCES ${SOURCES} gtkdraw-cairo.c) -ELSE(XTRKCAD_USE_GTK_CAIRO) - SET(SOURCES ${SOURCES} gtkdraw.c) -ENDIF(XTRKCAD_USE_GTK_CAIRO) - SET_SOURCE_FILES_PROPERTIES(wpref.c PROPERTIES COMPILE_FLAGS -DEXPORT=) INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR}) INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${GTK_UNIX_PRINT_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${GTK_WEBKIT_INCLUDE_DIRS}) ADD_LIBRARY(xtrkcad-wlib ${HEADERS} ${SOURCES}) TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_LIBRARIES}) +TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_UNIX_PRINT_LIBRARIES}) TARGET_LINK_LIBRARIES(xtrkcad-wlib ${GTK_WEBKIT_LIBRARIES}) -- cgit v1.2.3