Skip to content

Commit 365ea9e

Browse files
committed
Revert "CMake: make utf8proc, PCRE2, zlib and expat private dependencies"
This reverts commit 4b8f0a3.
1 parent bc35f14 commit 365ea9e

File tree

5 files changed

+22
-2
lines changed

5 files changed

+22
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,11 @@ install(
562562
Devel
563563
)
564564

565+
if(POCO_UNBUNDLED)
566+
install(FILES cmake/FindPCRE2.cmake DESTINATION "${PocoConfigPackageLocation}")
567+
install(FILES cmake/FindUtf8Proc.cmake DESTINATION "${PocoConfigPackageLocation}")
568+
endif()
569+
565570
message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
566571
message(STATUS "${PROJECT_NAME} package version: ${PROJECT_VERSION}")
567572
if(BUILD_SHARED_LIBS)

Foundation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ set_target_properties(Foundation
9999
)
100100

101101
if(POCO_UNBUNDLED)
102-
target_link_libraries(Foundation PRIVATE Pcre2::Pcre2 ZLIB::ZLIB Utf8Proc::Utf8Proc)
102+
target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB Utf8Proc::Utf8Proc)
103103
target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED)
104104
else()
105105
target_compile_definitions(Foundation PUBLIC UTF8PROC_STATIC)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1+
if(@POCO_UNBUNDLED@)
2+
include(CMakeFindDependencyMacro)
3+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
4+
find_dependency(ZLIB REQUIRED)
5+
find_dependency(PCRE2 REQUIRED)
6+
find_dependency(Utf8Proc REQUIRED)
7+
endif()
8+
19
include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake")

XML/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ target_include_directories(XML
5050
)
5151

5252
if(POCO_UNBUNDLED)
53-
target_link_libraries(XML PRIVATE EXPAT::EXPAT)
53+
target_link_libraries(XML PUBLIC EXPAT::EXPAT)
5454
target_compile_definitions(XML PUBLIC POCO_UNBUNDLED)
5555
else()
5656
if(WIN32)

XML/cmake/PocoXMLConfig.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
include(CMakeFindDependencyMacro)
22
find_dependency(PocoFoundation)
3+
if(@POCO_UNBUNDLED@)
4+
if(CMAKE_VERSION VERSION_LESS "3.10")
5+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V39")
6+
endif()
7+
find_dependency(EXPAT REQUIRED)
8+
endif()
9+
310
include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake")

0 commit comments

Comments
 (0)