From e7d7fa7069e90f13ee9ce83cde1ea508a9c0b57d Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sun, 29 Mar 2020 19:41:28 +0200 Subject: Conversion to the cmake building system. Signed-off-by: gregory guy --- kmag/CMakeLists.txt | 52 ++++++++++++++++++++++++++++++++ kmag/Makefile.am | 4 +-- kmag/hi16-action-followmouse.png | Bin 575 -> 0 bytes kmag/hi16-action-hidemouse.png | Bin 275 -> 0 bytes kmag/hi16-action-window.png | Bin 314 -> 0 bytes kmag/images/CMakeLists.txt | 3 ++ kmag/images/Makefile.am | 3 ++ kmag/images/hi16-action-followmouse.png | Bin 0 -> 575 bytes kmag/images/hi16-action-hidemouse.png | Bin 0 -> 275 bytes kmag/images/hi16-action-window.png | Bin 0 -> 314 bytes 10 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 kmag/CMakeLists.txt delete mode 100644 kmag/hi16-action-followmouse.png delete mode 100644 kmag/hi16-action-hidemouse.png delete mode 100644 kmag/hi16-action-window.png create mode 100644 kmag/images/CMakeLists.txt create mode 100644 kmag/images/Makefile.am create mode 100644 kmag/images/hi16-action-followmouse.png create mode 100644 kmag/images/hi16-action-hidemouse.png create mode 100644 kmag/images/hi16-action-window.png (limited to 'kmag') diff --git a/kmag/CMakeLists.txt b/kmag/CMakeLists.txt new file mode 100644 index 0000000..585630c --- /dev/null +++ b/kmag/CMakeLists.txt @@ -0,0 +1,52 @@ +add_subdirectory( images ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kmag (executable) + +tde_add_executable( kmag AUTOMOC + + SOURCES + kmagzoomview.cpp + kmagselrect.cpp + kmag.cpp + main.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeprint-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( kmag ) + + +##### other data + +install( + FILES kmagui.rc + DESTINATION ${DATA_INSTALL_DIR}/kmag +) + +install( + FILES kmag.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) diff --git a/kmag/Makefile.am b/kmag/Makefile.am index 1ecf6db..678b69e 100644 --- a/kmag/Makefile.am +++ b/kmag/Makefile.am @@ -15,9 +15,6 @@ KDE_ICON = kmag xdg_apps_DATA = kmag.desktop -kmagiconsdir = $(kde_datadir)/kmag/icons -kmagicons_ICON = followmouse hidemouse window - # set the include path for X, qt and KDE INCLUDES= $(all_includes) @@ -37,3 +34,4 @@ messages: rc.cpp $(XGETTEXT) $$LIST -o $(podir)/kmag.pot; \ fi +SUBDIRS = images diff --git a/kmag/hi16-action-followmouse.png b/kmag/hi16-action-followmouse.png deleted file mode 100644 index 1b690e8..0000000 Binary files a/kmag/hi16-action-followmouse.png and /dev/null differ diff --git a/kmag/hi16-action-hidemouse.png b/kmag/hi16-action-hidemouse.png deleted file mode 100644 index b792f7d..0000000 Binary files a/kmag/hi16-action-hidemouse.png and /dev/null differ diff --git a/kmag/hi16-action-window.png b/kmag/hi16-action-window.png deleted file mode 100644 index 1563cca..0000000 Binary files a/kmag/hi16-action-window.png and /dev/null differ diff --git a/kmag/images/CMakeLists.txt b/kmag/images/CMakeLists.txt new file mode 100644 index 0000000..b2c3d3f --- /dev/null +++ b/kmag/images/CMakeLists.txt @@ -0,0 +1,3 @@ +##### icons + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kmag/icons ) diff --git a/kmag/images/Makefile.am b/kmag/images/Makefile.am new file mode 100644 index 0000000..336246b --- /dev/null +++ b/kmag/images/Makefile.am @@ -0,0 +1,3 @@ + +kmagiconsdir = $(kde_datadir)/kmag/icons +kmagicons_ICON = followmouse hidemouse window diff --git a/kmag/images/hi16-action-followmouse.png b/kmag/images/hi16-action-followmouse.png new file mode 100644 index 0000000..1b690e8 Binary files /dev/null and b/kmag/images/hi16-action-followmouse.png differ diff --git a/kmag/images/hi16-action-hidemouse.png b/kmag/images/hi16-action-hidemouse.png new file mode 100644 index 0000000..b792f7d Binary files /dev/null and b/kmag/images/hi16-action-hidemouse.png differ diff --git a/kmag/images/hi16-action-window.png b/kmag/images/hi16-action-window.png new file mode 100644 index 0000000..1563cca Binary files /dev/null and b/kmag/images/hi16-action-window.png differ -- cgit v1.2.3