adjust and port utils to cmake build system

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2025-02-23 18:32:55 +00:00 · 2015-12-18 18:37:01 +02:00 · 2015-12-18 18:37:01 +02:00 · da53e9a455
commit da53e9a455
parent 7373a86388
25 changed files with 227 additions and 88 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -550,6 +550,19 @@ if(ENABLE_TESTING)
    add_subdirectory(tests)
 endif()

+# utilities needed for Katie maintainance
+add_subdirectory(util/fixnonlatin1)
+add_subdirectory(util/gencmap)
+add_subdirectory(util/lexgen)
+add_subdirectory(util/makeqpf)
+# FIXME: needs deprecated argc and argv, port to qcommandlineparser?
+# add_subdirectory(util/normalize)
+# TODO: add_subdirectory(util/plugintest)
+add_subdirectory(util/qlalr)
+add_subdirectory(util/qurl-generateTLDs)
+# TODO: add_subdirectory(util/unicode)
+add_subdirectory(util/xkbdatagen)
+
 # obsolete but still widely required headers
 katie_generate_obsolete(qtglobal.h QtCore qglobal.h)
 katie_generate_obsolete(qwizardpage.h QtGui qwizard.h)
--- a/util/fixnonlatin1/CMakeLists.txt
+++ b/util/fixnonlatin1/CMakeLists.txt
@ -0,0 +1,20 @@
+# add_definitions()
+set(EXTRA_FIXONLATIN1_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(FIXONLATIN1_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+katie_resources(${FIXONLATIN1_SOURCES})
+katie_setup_flags()
+
+add_executable(fixonlatin1 ${FIXONLATIN1_SOURCES})
+target_link_libraries(fixonlatin1 ${EXTRA_FIXONLATIN1_LIBS})
--- a/util/fixnonlatin1/fixnonlatin1.pro
+++ b/util/fixnonlatin1/fixnonlatin1.pro
@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET += 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += main.cpp
-
-QT = core
--- a/util/gencmap/CMakeLists.txt
+++ b/util/gencmap/CMakeLists.txt
@ -0,0 +1,22 @@
+# add_definitions()
+set(EXTRA_GENCMAP_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(GENCMAP_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gencmap.cpp
+)
+
+katie_resources(${GENCMAP_SOURCES})
+katie_setup_flags()
+
+add_executable(gencmap ${GENCMAP_SOURCES})
+target_link_libraries(gencmap ${EXTRA_GENCMAP_LIBS})
--- a/util/lexgen/CMakeLists.txt
+++ b/util/lexgen/CMakeLists.txt
@ -0,0 +1,32 @@
+# add_definitions()
+set(EXTRA_LEXGEN_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(LEXGEN_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/generator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nfa.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/configfile.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/re2nfa.cpp
+)
+
+set(LEXGEN_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/configfile.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/generator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/global.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/nfa.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/re2nfa.h
+)
+
+katie_resources(${LEXGEN_SOURCES} ${LEXGEN_HEADERS})
+katie_setup_flags()
+
+add_executable(lexgen ${LEXGEN_SOURCES} ${LEXGEN_HEADERS})
+target_link_libraries(lexgen ${EXTRA_LEXGEN_LIBS})
--- a/util/lexgen/lexgen.pri
+++ b/util/lexgen/lexgen.pri
@ -1,3 +0,0 @@
-VPATH += $$PWD
-SOURCES += nfa.cpp configfile.cpp re2nfa.cpp
-INCLUDEPATH += $$PWD
--- a/util/lexgen/lexgen.pro
+++ b/util/lexgen/lexgen.pro
@ -1,6 +0,0 @@
-TEMPLATE = app
-TARGET = lexgen
-include(lexgen.pri)
-SOURCES += main.cpp \
-    generator.cpp
-QT = core
--- a/util/makeqpf/CMakeLists.txt
+++ b/util/makeqpf/CMakeLists.txt
@ -0,0 +1,33 @@
+add_definitions(-DQT_NO_FREETYPE)
+set(EXTRA_MAKEQPF_LIBS KtCore KtGui)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtGui
+    ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
+    ${CMAKE_SOURCE_DIR}/src/gui/text
+)
+
+set(MAKEQPF_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/qpf2.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/makeqpf.qrc
+)
+
+set(MAKEQPF_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/qpf2.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.h
+)
+
+katie_resources(${MAKEQPF_SOURCES} ${MAKEQPF_HEADERS})
+katie_setup_flags()
+
+add_executable(makeqpf ${MAKEQPF_SOURCES} ${MAKEQPF_HEADERS})
+target_link_libraries(makeqpf ${EXTRA_MAKEQPF_LIBS})
--- a/util/makeqpf/main.cpp
+++ b/util/makeqpf/main.cpp
@ -44,7 +44,7 @@
 #include "qpf2.h"
 #include "mainwindow.h"

-#include <private/qfontengine_p.h>
+#include <qfontengine_p.h>

 QT_BEGIN_NAMESPACE

--- a/util/makeqpf/mainwindow.cpp
+++ b/util/makeqpf/mainwindow.cpp
@ -320,3 +320,5 @@ void MainWindow::addCustomFont(const QString &fontFile)
 }

 QT_END_NAMESPACE
+
+#include "moc_mainwindow.h"
--- a/util/makeqpf/makeqpf.pro
+++ b/util/makeqpf/makeqpf.pro
@ -1,20 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Nov 29 16:21:49 2006
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
-CONFIG += console
-DESTDIR = ../../bin
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS += target
-
-# Input
-HEADERS += qpf2.h mainwindow.h
-SOURCES += main.cpp qpf2.cpp mainwindow.cpp
-DEFINES += QT_NO_FREETYPE
-FORMS += mainwindow.ui
-RESOURCES += makeqpf.qrc
--- a/util/makeqpf/qpf2.cpp
+++ b/util/makeqpf/qpf2.cpp
@ -42,7 +42,7 @@
 #include "qpf2.h"

 #include <math.h>
-#include <private/qfontengine_p.h>
+#include <qfontengine_p.h>
 #include <QFile>
 #include <qendian.h>

--- a/util/makeqpf/qpf2.h
+++ b/util/makeqpf/qpf2.h
@ -42,7 +42,7 @@
 #ifndef QPF2_H
 #define QPF2_H

-#include <private/qfontengine_qpf_p.h>
+#include <qfontengine_qpf_p.h>
 #include <qmetatype.h>

 QT_BEGIN_NAMESPACE
--- a/util/normalize/CMakeLists.txt
+++ b/util/normalize/CMakeLists.txt
@ -0,0 +1,20 @@
+# add_definitions()
+set(EXTRA_NORMALIZE_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(NORMALIZE_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+katie_resources(${NORMALIZE_SOURCES})
+katie_setup_flags()
+
+add_executable(normalize ${NORMALIZE_SOURCES})
+target_link_libraries(normalize ${EXTRA_NORMALIZE_LIBS})
--- a/util/normalize/normalize.pro
+++ b/util/normalize/normalize.pro
@ -1,9 +0,0 @@
-TEMPLATE = app
-CONFIG -= moc
-
-# Input
-SOURCES += main.cpp
-
-QT = core
-CONFIG += warn_on console
-mac:CONFIG -= app_bundle
--- a/util/qlalr/CMakeLists.txt
+++ b/util/qlalr/CMakeLists.txt
@ -0,0 +1,36 @@
+# add_definitions()
+set(EXTRA_QLALR_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(QLALR_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/compress.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cppgenerator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/dotgraph.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/lalr.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/parsetable.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/recognizer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/grammar.cpp
+)
+
+set(QLALR_HEADERS
+    ${CMAKE_CURRENT_SOURCE_DIR}/compress.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/cppgenerator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/dotgraph.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/lalr.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/parsetable.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/grammar_p.h
+)
+
+katie_resources(${QLALR_SOURCES} ${QLALR_HEADERS})
+katie_setup_flags()
+
+add_executable(qlalr ${QLALR_SOURCES} ${QLALR_HEADERS})
+target_link_libraries(qlalr ${EXTRA_QLALR_LIBS})
--- a/util/qlalr/compress.cpp
+++ b/util/qlalr/compress.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/


-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QList>

 #include <algorithm>
--- a/util/qlalr/main.cpp
+++ b/util/qlalr/main.cpp
@ -42,7 +42,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QStringList>
-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>

 #include <cstdlib>

--- a/util/qlalr/qlalr.pro
+++ b/util/qlalr/qlalr.pro
@ -1,22 +0,0 @@
-
-TEMPLATE = app
-QT = core
-CONFIG += console
-TARGET = qlalr
-mac:CONFIG -= app_bundle
-
-SOURCES += compress.cpp \
-    cppgenerator.cpp \
-    dotgraph.cpp \
-    lalr.cpp \
-    main.cpp \
-    parsetable.cpp \
-    recognizer.cpp \
-    grammar.cpp
-
-HEADERS += compress.h \
-    cppgenerator.h \
-    dotgraph.h \
-    lalr.h \
-    parsetable.h \
-    grammar_p.h
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
--- a/util/qurl-generateTLDs/CMakeLists.txt
+++ b/util/qurl-generateTLDs/CMakeLists.txt
@ -0,0 +1,20 @@
+# add_definitions()
+set(EXTRA_QURLGENERATE_LIBS KtCore)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(QURLGENERATE_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+katie_resources(${QURLGENERATE_SOURCES})
+katie_setup_flags()
+
+add_executable(qurl-generateTLDs ${QURLGENERATE_SOURCES})
+target_link_libraries(qurl-generateTLDs ${EXTRA_QURLGENERATE_LIBS})
--- a/util/qurl-generateTLDs/qurl-generateTLDs.pro
+++ b/util/qurl-generateTLDs/qurl-generateTLDs.pro
@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-QT = core
-
-# Input
-SOURCES += main.cpp
--- a/util/xkbdatagen/CMakeLists.txt
+++ b/util/xkbdatagen/CMakeLists.txt
@ -0,0 +1,22 @@
+# add_definitions()
+set(EXTRA_XKBDATAGEN_LIBS KtCore KtXml)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_BINARY_DIR}/privateinclude
+    ${CMAKE_BINARY_DIR}/include/QtCore
+    ${CMAKE_BINARY_DIR}/privateinclude/QtCore
+    ${CMAKE_BINARY_DIR}/include/QtXml
+    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(XKBDATAGEN_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+katie_resources(${XKBDATAGEN_SOURCES})
+katie_setup_flags()
+
+add_executable(xkbdatagen ${XKBDATAGEN_SOURCES})
+target_link_libraries(xkbdatagen ${EXTRA_XKBDATAGEN_LIBS})
--- a/util/xkbdatagen/main.cpp
+++ b/util/xkbdatagen/main.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <QtCore>
-#include <QtXml>
+#include <QtXml/qdom.h>

 class XKBLayout
 {
--- a/util/xkbdatagen/xkbdatagen.pro
+++ b/util/xkbdatagen/xkbdatagen.pro
@ -1,3 +0,0 @@
-SOURCES = main.cpp
-QT = core xml
-