From 49ce296ac51321833c363cc65176070971c5f539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 5 Sep 2022 22:29:25 +0200 Subject: Housekeeping of CMake rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/CMakeLists.txt | 29 ++++++++++++++++++++++++----- src/qt_theme_draw.c | 4 ++++ 2 files changed, 28 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 195eaab..0f4025b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,23 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${GTK_INCLUDE_DIRS} + ${BONOBO_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${GTK_LIBDIR} + ${BONOBO_LIBDIR} +) + + +##### qtengine (shared) + set( target qtengine ) set( ${target}_SRCS @@ -9,15 +29,14 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} - LINK ${GTK_LINK_FLAGS} ${BONOBO_LINK_FLAGS} ${TQT_LIBRARIES} -lX11 -ltdecore + LINK ${GTK_LIBRARIES} ${BONOBO_LIBRARIES} X11 tdecore-shared DESTINATION ${INSTALL_PATH_GTK_ENGINES} ) -# Add GTK's cflags -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}") -INSTALL( +##### other data + +install( FILES gtkrc DESTINATION "${INSTALL_PATH_GTK_THEMES}/Qt/gtk-2.0" ) diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c index c7992d5..6473c9c 100644 --- a/src/qt_theme_draw.c +++ b/src/qt_theme_draw.c @@ -1,3 +1,7 @@ +#if defined( HAVE_CONFIG_H ) +# include "config.h" +#endif + #include #include #include -- cgit v1.2.3