diff options
author | gregory guy <g-gregory@gmx.fr> | 2019-06-28 15:14:51 +0200 |
---|---|---|
committer | gregory guy <gregory-tde@laposte.net> | 2021-03-11 15:04:14 +0100 |
commit | 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (patch) | |
tree | e532b01e8168b2f849f8aaa3266a58b088705726 /kimagemapeditor | |
parent | 10d21d001e92e653cec6b6d1c05983abd00a1195 (diff) | |
download | tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.tar.gz tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.zip |
Conversion to the cmake building system.
Delete empty files (dummy.cpp, xsldbgconfig.h).
Remove hard-coded path for the kmdr-executor executable.
Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
Add man pages taken from the Debian packaging.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Fix linking - kxsldbgcommon-static and kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kimagemapeditor')
-rw-r--r-- | kimagemapeditor/CMakeLists.txt | 83 | ||||
-rw-r--r-- | kimagemapeditor/Makefile.am | 3 | ||||
-rw-r--r-- | kimagemapeditor/dummy.cpp | 0 | ||||
-rw-r--r-- | kimagemapeditor/kimeshell.cpp | 8 | ||||
-rw-r--r-- | kimagemapeditor/pics/CMakeLists.txt | 16 |
5 files changed, 106 insertions, 4 deletions
diff --git a/kimagemapeditor/CMakeLists.txt b/kimagemapeditor/CMakeLists.txt new file mode 100644 index 00000000..78bfb22f --- /dev/null +++ b/kimagemapeditor/CMakeLists.txt @@ -0,0 +1,83 @@ +add_subdirectory( pics ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kimagemapeditorcommon (static) + +tde_add_library( kimagemapeditorcommon STATIC_PIC AUTOMOC + + SOURCES + qextfileinfo.cpp + areacreator.cpp + kimearea.cpp + kimecommands.cpp + kimedialogs.cpp + kimagemapeditor.cpp + drawzone.cpp + arealistview.cpp + imageslistview.cpp + mapslistview.cpp +) + + +##### libkimagemapeditor (kpart) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) + +tde_add_kpart( libkimagemapeditor AUTOMOC + + SOURCES + dummy.cpp + EMBED + kimagemapeditorcommon-static + LINK + tdeparts-shared + tdehtml-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### kimagemapeditor (executable) + +tde_add_executable( kimagemapeditor AUTOMOC + + SOURCES + main.cpp + kimeshell.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdehtml-shared + kimagemapeditorcommon-static + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kimagemapeditorui.rc kimagemapeditorpartui.rc + DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor +) + +tde_create_translated_desktop( kimagemapeditor.desktop ) + +tde_create_translated_desktop( + SOURCE kimagemapeditorpart.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index bde46f0d..da42d8d0 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -19,6 +19,7 @@ libkimagemapeditorcommon_la_SOURCES = \ imageslistview.cpp \ mapslistview.cpp +CLEANFILES = dummy.cpp libkimagemapeditor_la_SOURCES = \ dummy.cpp @@ -61,3 +62,5 @@ messages: rc.cpp $(XGETTEXT) $$LIST -o $(podir)/kimagemapeditor.pot; \ fi +dummy.cpp: + echo > dummy.cpp diff --git a/kimagemapeditor/dummy.cpp b/kimagemapeditor/dummy.cpp deleted file mode 100644 index e69de29b..00000000 --- a/kimagemapeditor/dummy.cpp +++ /dev/null diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 0cbcd542..942320ef 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -245,14 +245,14 @@ void KimeShell::optionsConfigureKeys() { } void KimeShell::optionsConfigureToolbars() -{ +{ #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else saveMainWindowSettings(TDEGlobal::config() ); # endif -#else +#else saveMainWindowSettings(TDEGlobal::config() ); #endif @@ -264,14 +264,14 @@ void KimeShell::optionsConfigureToolbars() } void KimeShell::applyNewToolbarConfig() -{ +{ #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else applyMainWindowSettings(TDEGlobal::config()); # endif -#else +#else applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/kimagemapeditor/pics/CMakeLists.txt b/kimagemapeditor/pics/CMakeLists.txt new file mode 100644 index 00000000..ab7482a7 --- /dev/null +++ b/kimagemapeditor/pics/CMakeLists.txt @@ -0,0 +1,16 @@ +##### icons + + +tde_install_icons( + addpoint arrow circle circle2 freehand lower + polygon raise rectangle removepoint + DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor/icons +) + +tde_install_icons( kimagemapeditor ) + +install( + FILES addpointcursor.png freehandcursor.png + polygoncursor.png removepointcursor.png + DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor +) |