build: fix uchardet

variar · Apr 18, 2022 · 8d8ef20 · 8d8ef20
1 parent 0ae6d42
commit 8d8ef20
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -13,8 +13,6 @@ if(KLOGG_USE_HYPERSCAN)
     CPMAddPackage("gh:intel/hyperscan@5.4.0")
 endif()
 
-#add_subdirectory(named_type EXCLUDE_FROM_ALL)
-
 CPMAddPackage(NAME maddy GITHUB_REPOSITORY variar/maddy GIT_TAG 67d331c59d3abc4e92eecc5874836a600dbfaf58 EXCLUDE_FROM_ALL YES)
 CPMAddPackage(NAME NamedType GITHUB_REPOSITORY joboccara/NamedType GIT_TAG 215f039574a7d5111f1a131def337f142029f896 DOWNLOAD_ONLY YES)
 if(NOT TARGET NamedType)
@@ -26,9 +24,12 @@ endif()
 CPMAddPackage(NAME Uchardet GITHUB_REPOSITORY freedesktop/Uchardet VERSION 0.0.7 EXCLUDE_FROM_ALL YES OPTIONS "BUILD_BINARY=OFF")
 if(TARGET libuchardet)
     message("Adding alias for uchardet")
-    SET(KLOGG_UCHARDET_LIBRARY libuchardet PARENT_SCOPE)
+    add_library(uchardet_wrapper INTERFACE)
+    target_link_libraries(uchardet_wrapper INTERFACE libuchardet)
 else()
-    SET(KLOGG_UCHARDET_LIBRARY uchardet PARENT_SCOPE)
+    add_library(uchardet_wrapper INTERFACE)
+    target_link_libraries(uchardet_wrapper INTERFACE ${UCHARDET_LIBRARY})
+    target_include_directories(uchardet_wrapper INTERFACE ${UCHARDET_INCLUDE_DIR})
 endif()
 
 CPMAddPackage(NAME KF5Archive GITHUB_REPOSITORY variar/klogg_karchive GIT_TAG f546bf6ae66a8d34b43da5a41afcfbf4e1a47906 EXCLUDE_FROM_ALL YES)

diff --git a/src/logdata/CMakeLists.txt b/src/logdata/CMakeLists.txt
@@ -54,7 +54,7 @@ target_link_libraries(klogg_logdata PUBLIC
 
         tbb
         NamedType
-        ${KLOGG_UCHARDET_LIBRARY}
+        uchardet_wrapper
         kdtoolbox
         robin_hood
         simdutf)

diff --git a/src/logdata/src/encodingdetector.cpp b/src/logdata/src/encodingdetector.cpp
@@ -22,7 +22,7 @@
 #include <QTextCodec>
 
 #include "log.h"
-#include "uchardet/uchardet.h"
+#include <uchardet.h>
 
 namespace {