summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-08 09:38:43 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-08 09:49:07 +0000
commita48a3e95cfeb29b7823a7de1730bb255a6f462da (patch)
tree8392b7f15d11f87790e42c9702a2cb19fd069bea /src/3rdparty
parentd56e627427b9707caa64e10d1214b0adacbc970b (diff)
Clean up tinycbor handling
Now that pro2cmake handles the include path resolution more like qmake, the tinycbor wrapper target is not needed anymore. Re-generated some CMakeLists.txt to complete that step. Change-Id: I032b2e9bdf9e26f63f3c550d7bca5df93369a82a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/CMakeLists.txt1
-rw-r--r--src/3rdparty/tinycbor/CMakeLists.txt6
2 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index 2d6aed7690..79ff5cd93c 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(tinycbor)
add_subdirectory(harfbuzz)
add_subdirectory(double-conversion)
diff --git a/src/3rdparty/tinycbor/CMakeLists.txt b/src/3rdparty/tinycbor/CMakeLists.txt
deleted file mode 100644
index d0c90165bf..0000000000
--- a/src/3rdparty/tinycbor/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_library(tinycbor INTERFACE)
-target_include_directories(tinycbor
- INTERFACE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
-
-qt_install_3rdparty_library(tinycbor)