diff options
| author | gregory guy <g-gregory@gmx.fr> | 2019-06-27 16:35:25 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-28 13:45:47 +0200 |
| commit | aca01d5a8b7d3de53fa34696e18c91db720a5ab6 (patch) | |
| tree | 6b9b83c599cc5db58df8041ca5cf812e00bbd25e /kig/scripting | |
| parent | 88af19c041ad4f1139f6f0a35cd1a4fe2018425f (diff) | |
| download | tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.tar.gz tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.zip | |
Conversion to the cmake building system.
Add includes to UI files to resolve FTBFS.
Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4a1613e9f119ae68c695ab60f8d9856d1a54a52)
Diffstat (limited to 'kig/scripting')
| -rw-r--r-- | kig/scripting/CMakeLists.txt | 41 | ||||
| -rw-r--r-- | kig/scripting/python_scripter.cc | 3 |
2 files changed, 43 insertions, 1 deletions
diff --git a/kig/scripting/CMakeLists.txt b/kig/scripting/CMakeLists.txt new file mode 100644 index 00000000..01a2e5d6 --- /dev/null +++ b/kig/scripting/CMakeLists.txt @@ -0,0 +1,41 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${Boost_LIBRARY_DIRS} +) + + +##### kigscripting (static) + +tde_add_library( kigscripting STATIC_PIC AUTOMOC + + SOURCES + newscriptwizardbase.ui + python_type.cc + python_scripter.cc + script-common.cc + script_mode.cc + newscriptwizard.cc + LINK + katepartinterfaces + ${PYTHON_LIBRARIES} + ${Boost_LIBRARIES} +) + + +##### other data + +install( + FILES python-kig.xml + DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax +) diff --git a/kig/scripting/python_scripter.cc b/kig/scripting/python_scripter.cc index 7e833d5c..00c7e162 100644 --- a/kig/scripting/python_scripter.cc +++ b/kig/scripting/python_scripter.cc @@ -15,6 +15,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "config.h" #include "python_scripter.h" #include <iostream> @@ -357,7 +358,7 @@ PythonScripter::PythonScripter() // the newstring stuff is to prevent warnings about conversion from // const char* to char*.. char* s = newstring( "kig" ); - PyImport_AppendInittab( s, initkig ); + PyImport_AppendInittab( s, KIG_Python_init ); // we can't delete this yet, since python keeps a pointer to it.. // This means we have a small but harmless memory leak here, but it // doesn't hurt at all, since it could only be freed at the end of |