summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-07-07 02:03:40 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-07-07 02:03:40 +0200
commit280d34760309d05d23958e9143179dce7adf8a3f (patch)
treea9cfd15ab01f6afa365d5d02f7b329a4bbf7d808
parent724a0380b7709a64a433dff0cc8fba26aea1df98 (diff)
downloadsink-280d34760309d05d23958e9143179dce7adf8a3f.tar.gz
sink-280d34760309d05d23958e9143179dce7adf8a3f.zip
cleanup
-rw-r--r--CMakeLists.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd4a229..0be5d90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,18 +5,14 @@ cmake_minimum_required(VERSION 2.8.12)
5find_package(ECM 0.0.10 REQUIRED NO_MODULE) 5find_package(ECM 0.0.10 REQUIRED NO_MODULE)
6set(CMAKE_MODULE_PATH 6set(CMAKE_MODULE_PATH
7 ${ECM_MODULE_PATH} 7 ${ECM_MODULE_PATH}
8 # ${ECM_KDE_MODULE_DIR}
9 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules 8 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
10 ${CMAKE_MODULE_PATH}) 9 ${CMAKE_MODULE_PATH})
11 10
12include(FeatureSummary) 11include(FeatureSummary)
13include(GenerateExportHeader) 12include(GenerateExportHeader)
14#include(ECMSetupVersion)
15include(ECMGenerateHeaders) 13include(ECMGenerateHeaders)
16include(ECMPackageConfigHelpers) 14include(ECMPackageConfigHelpers)
17include(KDEInstallDirs) 15include(KDEInstallDirs)
18# include(KDEFrameworkCompilerSettings)
19# include(KDECMakeSettings)
20 16
21find_package(Qt5 COMPONENTS REQUIRED Core Widgets Network) 17find_package(Qt5 COMPONENTS REQUIRED Core Widgets Network)
22find_package(KF5 COMPONENTS REQUIRED Async) 18find_package(KF5 COMPONENTS REQUIRED Async)
@@ -26,7 +22,7 @@ function(generate_flatbuffers _target)
26 message("making ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h from ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs") 22 message("making ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h from ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs")
27 add_custom_command( 23 add_custom_command(
28 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h 24 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h
29 COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE} -c -b --gen-includes -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs 25 COMMAND ${FLATBUFFERS_FLATC_EXECUTABLE} -c -b -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs
30 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs 26 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${fbs}.fbs
31 ) 27 )
32 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h PROPERTIES GENERATED 1) 28 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${fbs}_generated.h PROPERTIES GENERATED 1)