From 60fe29f9e1432c6eb9add1c9136d8d1744e7d6aa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 18 Dec 2015 20:26:34 +0200 Subject: [PATCH] port unicode utility to cmake build system --- CMakeLists.txt | 2 +- util/unicode/CMakeLists.txt | 20 ++++++++++++++++++++ util/unicode/unicode.pro | 3 --- 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 util/unicode/CMakeLists.txt delete mode 100644 util/unicode/unicode.pro diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ba5dd792..bf0a3d6b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,7 +559,7 @@ 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/unicode) add_subdirectory(util/xkbdatagen) # obsolete but still widely required headers diff --git a/util/unicode/CMakeLists.txt b/util/unicode/CMakeLists.txt new file mode 100644 index 000000000..e4dd00b71 --- /dev/null +++ b/util/unicode/CMakeLists.txt @@ -0,0 +1,20 @@ +# add_definitions() +set(EXTRA_UNICODE_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(UNICODE_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp +) + +katie_resources(${UNICODE_SOURCES}) +katie_setup_flags() + +add_executable(unicode ${UNICODE_SOURCES}) +target_link_libraries(unicode ${EXTRA_UNICODE_LIBS}) diff --git a/util/unicode/unicode.pro b/util/unicode/unicode.pro deleted file mode 100644 index 0250c2a43..000000000 --- a/util/unicode/unicode.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += main.cpp -QT = core -CONFIG += console