diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:25:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:25:00 +0100 |
| commit | db0fcf9142f9ee7035370f832036c873d4c87168 (patch) | |
| tree | a4062cdf2158362a0a431eb1806719e9f0975cb1 /app/wlib/gtklib/CMakeLists.txt | |
| parent | ee016bcb70b5c380e03b5fd2c12b1baa504c3cc8 (diff) | |
| parent | 09795a01ef859f072920de9df974d1b03b9ab9a4 (diff) | |
Merge tag 'upstream/4.2.4a'
Upstream version 4.2.4a
Diffstat (limited to 'app/wlib/gtklib/CMakeLists.txt')
| -rw-r--r-- | app/wlib/gtklib/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
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}) |