mirror of https://github.com/microsoft/vcpkg.git
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
|
|
index a539c776..7cc32371 100644
|
|
--- a/3rdparty/CMakeLists.txt
|
|
+++ b/3rdparty/CMakeLists.txt
|
|
@@ -22,7 +22,11 @@ endif()
|
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/adobe/afdko/resource")
|
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/adobe/afdko/include")
|
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/chromium")
|
|
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tcbspan")
|
|
|
|
add_library(podofo_3rdparty STATIC ${SOURCE_FILES})
|
|
target_link_libraries(podofo_3rdparty LibXml2::LibXml2)
|
|
+if (PODOFO_DEVENDOR_TCBSPAN)
|
|
+ target_link_libraries(podofo_3rdparty "$<COMPILE_ONLY:tcbspan::tcbspan>")
|
|
+else()
|
|
+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/tcbspan")
|
|
+endif()
|
|
diff --git a/src/podofo/auxiliary/span.h b/src/podofo/auxiliary/span.h
|
|
index d484b775..3a307747 100644
|
|
--- a/src/podofo/auxiliary/span.h
|
|
+++ b/src/podofo/auxiliary/span.h
|
|
@@ -2,7 +2,7 @@
|
|
#define AUX_SPAN_H
|
|
#pragma once
|
|
|
|
-#include <podofo/3rdparty/span.hpp>
|
|
+#include <tcb/span.hpp>
|
|
|
|
namespace PoDoFo
|
|
{
|
|
diff --git a/src/podofo/podofo-config.cmake.in b/src/podofo/podofo-config.cmake.in
|
|
index 700619bb..87529246 100644
|
|
--- a/src/podofo/podofo-config.cmake.in
|
|
+++ b/src/podofo/podofo-config.cmake.in
|
|
@@ -2,6 +2,9 @@
|
|
|
|
if("@PODOFO_BUILD_STATIC@")
|
|
include(CMakeFindDependencyMacro)
|
|
+ if("@PODOFO_DEVENDOR_UTF8PROC@")
|
|
+ find_dependency(utf8proc CONFIG)
|
|
+ endif()
|
|
if("@Fontconfig_FOUND@")
|
|
find_dependency(Fontconfig)
|
|
endif()
|