From f84a48543b2471121d36334e094e0f85f9b9c431 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Mon, 12 Oct 2020 15:43:57 +0200 Subject: Conversion to the cmake building system. Added man pages taken from the Debian packaging system. Move the ktechlab.desktop file into XDG_APPS_INSTALL_DIR directory, see TDE/tde#26 and bug 2408. Signed-off-by: gregory guy (cherry picked from commit a9c86866c380e503dd75797b5c2d129bfb622a9e) --- src/gui/CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/gui/newfiledlg.cpp | 3 +++ src/gui/projectdlgs.cpp | 2 ++ src/gui/symbolviewer.h | 2 ++ 4 files changed, 51 insertions(+) create mode 100644 src/gui/CMakeLists.txt (limited to 'src/gui') diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt new file mode 100644 index 0000000..2e38f19 --- /dev/null +++ b/src/gui/CMakeLists.txt @@ -0,0 +1,44 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/electronics + ${CMAKE_SOURCE_DIR}/src/electronics/components + ${CMAKE_SOURCE_DIR}/src/electronics/simulation + ${CMAKE_SOURCE_DIR}/src/flowparts + ${CMAKE_SOURCE_DIR}/src/languages + ${CMAKE_SOURCE_DIR}/src/mechanics + ${CMAKE_SOURCE_DIR}/src/micro +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### gui (static) + +tde_add_library( gui STATIC_PIC AUTOMOC + + SOURCES + asmformattingwidget.ui gpasmsettingswidget.ui + logicwidget.ui newfilewidget.ui newprojectwidget.ui + outputmethodwidget.ui microsettingswidget.ui + oscilloscopewidget.ui generaloptionswidget.ui + createsubprojectwidget.ui processingoptionswidget.ui + sdccoptionswidget.ui linkeroptionswidget.ui + picprogrammerconfigwidget.ui newpinmappingwidget.ui + programmerwidget.ui + contexthelp.cpp doublespinbox.cpp itemeditor.cpp + itemselector.cpp microsettingsdlg.cpp + newfiledlg.cpp orientationwidget.cpp + outputmethoddlg.cpp pieditor.cpp plvitem.cpp + propertieslistview.cpp settingsdlg.cpp oscilloscope.cpp + oscilloscopeview.cpp probepositioner.cpp logview.cpp + projectdlgs.cpp microselectwidget.cpp + symbolviewer.cpp programmerdlg.cpp colorcombo.cpp +) diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index fac51d5..e379976 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -8,7 +8,10 @@ * (at your option) any later version. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include "document.h" #include "microinfo.h" #include "newfiledlg.h" diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp index f6e2718..6ab051b 100644 --- a/src/gui/projectdlgs.cpp +++ b/src/gui/projectdlgs.cpp @@ -270,6 +270,8 @@ void ProcessingOptionsDlg::accept() void ProcessingOptionsDlg::reject() { } + +#include "projectdlgs.moc" //END class ProcessingOptionsDlg diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index d0ab0d7..a85253f 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -8,7 +8,9 @@ * (at your option) any later version. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #ifndef NO_GPSIM #ifndef SYMBOLVIEWER_H -- cgit v1.2.3