diff --git a/CMakeLists.txt b/CMakeLists.txt index eb574bb2..8e2f620d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ function(add_cxx_flag_if_supported) endforeach() endfunction() -find_package(utf8cpp 3.2.0) +find_package(utf8cpp) if(NOT utf8cpp_FOUND) include(FetchContent REQUIRED) FetchContent_Declare( @@ -61,6 +61,11 @@ if(NOT utf8cpp_FOUND) ) FetchContent_MakeAvailable(utf8cpp) endif() +if(TARGET utf8cpp::utf8cpp) + set(libebml_utf8cpp_link_libraries utf8cpp::utf8cpp) +else() + set(libebml_utf8cpp_link_libraries $) +endif() if(DEV_MODE) message(STATUS "Using developer mode for ${CMAKE_CXX_COMPILER_ID}") @@ -138,7 +143,7 @@ if(WIN32) target_compile_definitions(ebml PRIVATE _CRT_SECURE_NO_WARNINGS) endif() -target_link_libraries(ebml PRIVATE $) +target_link_libraries(ebml PRIVATE ${libebml_utf8cpp_link_libraries}) if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20") if(${CMAKE_CXX_BYTE_ORDER} STREQUAL "BIG_ENDIAN") diff --git a/NEWS.md b/NEWS.md index 08543424..e334de63 100644 --- a/NEWS.md +++ b/NEWS.md @@ -36,6 +36,7 @@ parent projects via `add_subdirectory`. * Enabled building shared libraries via the usual CMake definition `BUILD_SHARES_LIBS` (default: off). +* Fixed cmake rules for building with utf8cpp 4.x; fixes #344 # Version 1.4.3 2022-09-30