summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2018-12-06 13:26:10 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-12-10 20:17:51 +0100
commit667222c4d4b53800adf94734c11ac3ea081d6212 (patch)
treee1b1b57cea39c46c77fc74c17e118464f7da15a3 /src
parent6498c612f7b3e514fd5370b091343c024814c1f5 (diff)
downloadkpicosim-667222c4d4b53800adf94734c11ac3ea081d6212.tar.gz
kpicosim-667222c4d4b53800adf94734c11ac3ea081d6212.zip
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr> (cherry picked from commit 5fc3ae36c8e07ed7157b04ce25b7339a119be471)
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt69
-rw-r--r--src/cinstruction.cpp2
-rw-r--r--src/jtagprogrammer.cpp1
-rw-r--r--src/jtagprogrammer.h2
-rw-r--r--src/kjtagdialog.cpp2
-rw-r--r--src/kport.cpp2
-rw-r--r--src/kprocessorview.cpp2
-rw-r--r--src/kserialview.cpp2
-rw-r--r--src/pics/CMakeLists.txt4
9 files changed, 81 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..467a30b
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,69 @@
+add_subdirectory( pics )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/debian
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kpicosim (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+ SOURCES
+ main.cpp
+ kpicosim.cpp
+ codeeditor.cpp
+ ksimulator.cpp
+ kprocessorview.cpp
+ kserialview.cpp
+ kportview.cpp
+ kscratchpadview.cpp
+ kport.cpp
+ kexportdialog.cpp
+ cassembler.cpp
+ cinstruction.cpp
+ cpicoblaze.cpp
+ jtagdevice.cpp
+ kjtagdialog.cpp
+ jtag.cpp
+ jtagprogrammer.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other data
+
+install(
+ FILES kpicosimui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+install(
+ FILES psm.xml
+ DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax
+)
+
+install(
+ FILES ${PROJECT_NAME}.desktop
+ DESTINATION ${APPS_INSTALL_DIR}/Development
+)
diff --git a/src/cinstruction.cpp b/src/cinstruction.cpp
index 9c6fba8..93765db 100644
--- a/src/cinstruction.cpp
+++ b/src/cinstruction.cpp
@@ -1,6 +1,6 @@
#include "cinstruction.h"
-#include "iostream"
+#include <iostream>
using namespace std ;
diff --git a/src/jtagprogrammer.cpp b/src/jtagprogrammer.cpp
index d40e19c..7060ee0 100644
--- a/src/jtagprogrammer.cpp
+++ b/src/jtagprogrammer.cpp
@@ -231,3 +231,4 @@ void JTAGProgrammer::setBitFile( std::string filename )
m_bitFilename = filename ;
}
+#include "jtagprogrammer.moc"
diff --git a/src/jtagprogrammer.h b/src/jtagprogrammer.h
index d5ad78c..0930a7a 100644
--- a/src/jtagprogrammer.h
+++ b/src/jtagprogrammer.h
@@ -21,7 +21,7 @@
#define JTAGPROGRAMMER_H
#include <tqobject.h>
-#include <string.h>
+#include <string>
#include "jtag.h"
class JTAGProgrammer : public TQObject
{
diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp
index 9122cf9..e8b092b 100644
--- a/src/kjtagdialog.cpp
+++ b/src/kjtagdialog.cpp
@@ -114,4 +114,4 @@ void KJTAGDialog::addMessage( const char *msg )
m_debug->insert( msg ) ;
}
-
+#include "kjtagdialog.moc"
diff --git a/src/kport.cpp b/src/kport.cpp
index d158cfd..4fb3b58 100644
--- a/src/kport.cpp
+++ b/src/kport.cpp
@@ -45,4 +45,4 @@ void KPort::setReadValue( uint8_t value ) {
m_readValue = value ;
}
-
+#include "kport.moc"
diff --git a/src/kprocessorview.cpp b/src/kprocessorview.cpp
index 0bc27b5..c483681 100644
--- a/src/kprocessorview.cpp
+++ b/src/kprocessorview.cpp
@@ -204,5 +204,5 @@ TDEProcessorView::~TDEProcessorView()
delete view ;
}
-
+#include "kprocessorview.moc"
diff --git a/src/kserialview.cpp b/src/kserialview.cpp
index ae2ef4d..b2f5a58 100644
--- a/src/kserialview.cpp
+++ b/src/kserialview.cpp
@@ -319,3 +319,5 @@ void KSerialView::setStatusBits( unsigned char value )
m_statusBits[ 4 ]->setChecked( (value & 0x08) != 0 ) ;
m_statusBits[ 5 ]->setChecked( (value & 0x04) != 0 ) ;
}
+
+#include "kserialview.moc"
diff --git a/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt
new file mode 100644
index 0000000..8593cb4
--- /dev/null
+++ b/src/pics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+ FILES continue.png interrupt.png next.png rebuild.png reset.png
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)