From nobody Tue Nov 14 17:17:52 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVCfm5HGWz51YJ9; Tue, 14 Nov 2023 17:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SVCfm3rGHz4Rl3; Tue, 14 Nov 2023 17:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiIs/2SquPflkuXeshhiwUYAyhIpyq6vvdUULx3yBzE=; b=n339U9N9eXaz+5ZLGZcpFNrceRvgh8gqvf/ZMy1/Nb5APbiCRD9s1x17jd1MZHv2T1DIWy serrhmwF0KblpDibQdui+IFLMofy16woEiJQg9YO3rxHfpHrEgZQ7pdjl9gCMRrLfG/OY6 XL3nZg94fc+poyq80aVSPxxTgZik9ODDZELWqT1xONvVO2S+aaAfxQKPPju4UQWL0UWdfn MluvsgUkz0joPwZocXRwCUYQ/fGgtX9PToyQ+1rCRGxpErZLUNGXY37gaIR2Npu6ZXb1LD dzchneFfHdtGtcX8oqoU3DUC/ZJVBhb1Nfd+jnQr5Qn0RsZb38WIEc/ZL91Myw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiIs/2SquPflkuXeshhiwUYAyhIpyq6vvdUULx3yBzE=; b=mEInY6l75b7cixXGjgYBNoINYOOjGisP8aaSqDORVO9vKXGmiQbYY6trfdxHPfLUEGtngN 4lo79foOcemn+/d2Z9XBFy327mYHzkSIDMf2WnmSdLPPfCzBc1j+8R3bLpHPIMl5V+Q5W8 xCEXr4eUxo1GUaIAum+vAbPRP9JPLQwEYANmuSCExwcnxUWL0eecnpyH2SBMjsHoZFGx0K d53S6U7XmnNoJNcXZkl+/0soN3xF8dIASiPDVvZ9kIwLfn50m4ShidGKrQlf0Nuh0Ua4OP 26dzjigIypZ0NuXgjzlBVmjl0cSV6avMWh8VNQNLTZjiFIdQiqxNvrXAlPHPVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699982272; a=rsa-sha256; cv=none; b=A2eogr9OmdZo/p0OpsE2U6efJFnF8iLNZR8t80qQAGoUZcZzeOEHwmmuyiiFY0bnBicCNM asrms5GfVO8sGBubcA8OTnldlQuen6sxdOEvS2+vVnh5eZn18rGy1xQZprQur74rE3AD6L 6O5Q6hxX+PUpEeIqXgFGyAPgBwf7WwfRg9k+klammDNE0ye0JR2L0moW/GXZIKnaNXlrel X8at2taYQZwseKg88Yz3TpJXnLGHWyzYexkYj4xS6EU0m/jzH67syAdE8PopVH5eCCUu26 wQP1lw8JehhWqehULs0TNlMS6O+PtVN5ha1ilCOB5pJWEXO97+vZD+Ey+I671w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SVCfm2wTnzx2k; Tue, 14 Nov 2023 17:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEHHqmH057284; Tue, 14 Nov 2023 17:17:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEHHqYf057281; Tue, 14 Nov 2023 17:17:52 GMT (envelope-from git) Date: Tue, 14 Nov 2023 17:17:52 GMT Message-Id: <202311141717.3AEHHqYf057281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 20d1ed50cfbb - main - devel/libddwaf: Update to 1.15.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20d1ed50cfbbc4ea52c4aa1c50e66cf52d4f8fb9 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=20d1ed50cfbbc4ea52c4aa1c50e66cf52d4f8fb9 commit 20d1ed50cfbbc4ea52c4aa1c50e66cf52d4f8fb9 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 16:29:39 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-14 17:15:31 +0000 devel/libddwaf: Update to 1.15.0 Changes: https://github.com/DataDog/libddwaf/releases --- devel/libddwaf/Makefile | 8 ++-- devel/libddwaf/distinfo | 14 +++---- devel/libddwaf/files/patch-CMakeLists.txt | 42 +++++++------------ .../files/patch-third_party-CMakeLists.txt | 47 ++++++---------------- 4 files changed, 37 insertions(+), 74 deletions(-) diff --git a/devel/libddwaf/Makefile b/devel/libddwaf/Makefile index 929b3908a9f9..d5f1f85b4f0d 100644 --- a/devel/libddwaf/Makefile +++ b/devel/libddwaf/Makefile @@ -1,6 +1,5 @@ PORTNAME= libddwaf -PORTVERSION= 1.14.0 -PORTREVISION= 2 +PORTVERSION= 1.15.0 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -15,6 +14,7 @@ LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3 BUILD_DEPENDS= rapidjson>=1.1.0.524:devel/rapidjson LIB_DEPENDS= libac.so:devel/libac \ libbenchmark.so:devel/benchmark \ + libfmt.so:devel/libfmt \ libgtest.so:devel/googletest \ libinjection.so:devel/libinjection \ libre2.so:devel/re2 \ @@ -28,8 +28,8 @@ CMAKE_ON= LIBDDWAF_BUILD_SHARED LIBDDWAF_BUILD_STATIC USE_GITHUB= yes GH_ACCOUNT= DataDog -GH_TUPLE= DataDog:appsec-event-rules:1.7.2:DataDog_appsec_event_rules/third_party/proj_event_rules \ - Tencent:rapidjson:476ffa2:Tencent_rapidjson/third_party/rapidjson +GH_TUPLE= DataDog:appsec-event-rules:1.8.0:DataDog_appsec_event_rules/third_party/proj_event_rules \ + Tencent:rapidjson:f9d5341:Tencent_rapidjson/third_party/rapidjson post-patch: # Clean up bundled libraries diff --git a/devel/libddwaf/distinfo b/devel/libddwaf/distinfo index 55e79c425138..9e8ed66aa7ef 100644 --- a/devel/libddwaf/distinfo +++ b/devel/libddwaf/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1694348240 -SHA256 (DataDog-libddwaf-1.14.0_GH0.tar.gz) = b6064baa887da67b0e48116d9a2e413bd6bd687e67e859d36a1fe26870410d19 -SIZE (DataDog-libddwaf-1.14.0_GH0.tar.gz) = 775136 -SHA256 (DataDog-appsec-event-rules-1.7.2_GH0.tar.gz) = 4d4a699949e7bb9ad0fa513094f6e47a40e9b1f2e5023590b8476172da0055d7 -SIZE (DataDog-appsec-event-rules-1.7.2_GH0.tar.gz) = 136232 -SHA256 (Tencent-rapidjson-476ffa2_GH0.tar.gz) = 6a1628b73d007ffe5d2bc84f206d05b2194e25eeb0585a41bfd29db150591f84 -SIZE (Tencent-rapidjson-476ffa2_GH0.tar.gz) = 1115582 +TIMESTAMP = 1699774452 +SHA256 (DataDog-libddwaf-1.15.0_GH0.tar.gz) = ea106abd88acc419341e9be4f172efc392bfa34016acc78774d1cd30bd6e33b0 +SIZE (DataDog-libddwaf-1.15.0_GH0.tar.gz) = 926926 +SHA256 (DataDog-appsec-event-rules-1.8.0_GH0.tar.gz) = 89ffe8639f73403c5641a7e27c0294a0217342c054f1d119212ee2e860662d24 +SIZE (DataDog-appsec-event-rules-1.8.0_GH0.tar.gz) = 152303 +SHA256 (Tencent-rapidjson-f9d5341_GH0.tar.gz) = 50dfb066d9de1fc5738ce4d35bd8dc04a2a7c9196331cd2143e0069da5ea1265 +SIZE (Tencent-rapidjson-f9d5341_GH0.tar.gz) = 1115737 diff --git a/devel/libddwaf/files/patch-CMakeLists.txt b/devel/libddwaf/files/patch-CMakeLists.txt index 5d7df8ac29b0..eee96f28ae1f 100644 --- a/devel/libddwaf/files/patch-CMakeLists.txt +++ b/devel/libddwaf/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2023-08-17 10:28:49 UTC +--- CMakeLists.txt.orig 2023-10-31 14:13:07 UTC +++ CMakeLists.txt @@ -7,24 +7,24 @@ set(CMAKE_PROJECT_VERSION ${version}) @@ -36,7 +36,7 @@ option(LIBDDWAF_BUILD_SHARED "Build shared library" ON) option(LIBDDWAF_BUILD_STATIC "Build shared library" ON) -@@ -58,7 +58,7 @@ endif() +@@ -59,7 +59,7 @@ endif() include(GNUInstallDirs) @@ -45,17 +45,16 @@ add_library(glibc_compat OBJECT ${libddwaf_SOURCE_DIR}/src/glibc-compat/time64.c) set_target_properties(glibc_compat PROPERTIES POSITION_INDEPENDENT_CODE 1) -@@ -143,7 +143,8 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D +@@ -159,7 +159,7 @@ install(FILES ${libddwaf_SOURCE_DIR}/include/ddwaf.h D # System dependencies set(LIBDDWAF_INTERFACE_LIBRARIES "") --set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_ac lib_injection lib_radix lib_utf8proc) -+#set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_ac lib_injection lib_radix lib_utf8proc) -+set(LIBDDWAF_PRIVATE_LIBRARIES lib_radix) +-set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_utf8proc) ++#set(LIBDDWAF_PRIVATE_LIBRARIES lib_re2 lib_utf8proc) if(NOT MSVC AND LIBDDWAF_TEST_COVERAGE) target_compile_options(libddwaf_objects PRIVATE -ggdb --coverage) -@@ -176,6 +177,27 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +@@ -192,6 +192,28 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif(WIN32) list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ws2_32) endif() @@ -63,13 +62,14 @@ +if (LIBAC) + list(APPEND LIBDDWAF_INTERFACE_LIBRARIES ac) +endif() ++find_library(LIBFMT fmt) ++if (LIBFMT) ++ list(APPEND LIBDDWAF_INTERFACE_LIBRARIES fmt) ++endif() +find_library(LIBINJECTION injection) +if (LIBINJECTION) + list(APPEND LIBDDWAF_INTERFACE_LIBRARIES injection) +endif() -+add_library(lib_radix STATIC ${PROJECT_SOURCE_DIR}/third_party/radixlib/radixlib.c) -+target_include_directories(lib_radix INTERFACE ${PROJECT_SOURCE_DIR}/third_party/radixlib) -+set_target_properties(lib_radix PROPERTIES POSITION_INDEPENDENT_CODE 1) +add_library(lib_rapidjson INTERFACE IMPORTED GLOBAL) +target_include_directories(lib_rapidjson INTERFACE ${PROJECT_SOURCE_DIR}/third_party/rapidjson/include) +find_library(LIBRE2 re2) @@ -83,7 +83,7 @@ target_link_libraries(libddwaf_objects PRIVATE ${LIBDDWAF_PRIVATE_LIBRARIES} -@@ -200,71 +222,72 @@ if (LIBDDWAF_BUILD_STATIC) +@@ -216,64 +238,65 @@ if (LIBDDWAF_BUILD_STATIC) INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) # Post-processing on the static library @@ -92,8 +92,7 @@ - COMMAND ${CMAKE_COMMAND} -E make_directory lib_comb - COMMAND ${CMAKE_COMMAND} -E chdir lib_comb lib.exe - /OUT:combined${CMAKE_STATIC_LIBRARY_SUFFIX} -- $ $ $ -- $ $ $ +- $ $ $ - COMMAND ${CMAKE_COMMAND} -E copy lib_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - else() @@ -102,10 +101,7 @@ - COMMAND ${CMAKE_COMMAND} -E make_directory ar_comb - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND libtool -static -o ar_comb/combined.a -arch_only ${CMAKE_OSX_ARCHITECTURES} ar_comb/*.o* - - COMMAND ${CMAKE_COMMAND} -E copy ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ @@ -116,10 +112,7 @@ - COMMAND ${CMAKE_COMMAND} -E make_directory ar_comb - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -- COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ - COMMAND ${CMAKE_COMMAND} -E copy $ ar_comb - COMMAND ${CMAKE_AR} -qcs ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} ar_comb/*.o* - @@ -148,8 +141,7 @@ +# COMMAND ${CMAKE_COMMAND} -E make_directory lib_comb +# COMMAND ${CMAKE_COMMAND} -E chdir lib_comb lib.exe +# /OUT:combined${CMAKE_STATIC_LIBRARY_SUFFIX} -+# $ $ $ -+# $ $ $ ++# $ $ $ +# COMMAND ${CMAKE_COMMAND} -E copy lib_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ +# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +# else() @@ -158,10 +150,7 @@ +# COMMAND ${CMAKE_COMMAND} -E make_directory ar_comb +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND libtool -static -o ar_comb/combined.a -arch_only ${CMAKE_OSX_ARCHITECTURES} ar_comb/*.o* +# +# COMMAND ${CMAKE_COMMAND} -E copy ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} $ @@ -172,10 +161,7 @@ +# COMMAND ${CMAKE_COMMAND} -E make_directory ar_comb +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ -+# COMMAND ${CMAKE_COMMAND} -E chdir ar_comb ${CMAKE_AR} -x $ +# COMMAND ${CMAKE_COMMAND} -E copy $ ar_comb +# COMMAND ${CMAKE_AR} -qcs ar_comb/combined${CMAKE_STATIC_LIBRARY_SUFFIX} ar_comb/*.o* +# @@ -213,7 +199,7 @@ +# OUTPUT_VARIABLE BUILD_ID +# OUTPUT_STRIP_TRAILING_WHITESPACE +# ) -+ set(BUILD_ID "25b0021f1d2ce1eea39a37ad41b6de9eec12ee84") ++ set(BUILD_ID "e7d3c209402b8d81d119584cb147f88efe976965") message(STATUS "Build id is ${BUILD_ID}") string(SUBSTRING "${BUILD_ID}" 0 2 BUILD_ID_PREFIX) string(SUBSTRING "${BUILD_ID}" 2 39 BUILD_ID_SUFFIX) diff --git a/devel/libddwaf/files/patch-third_party-CMakeLists.txt b/devel/libddwaf/files/patch-third_party-CMakeLists.txt index 41564fb5cdf0..49cd330eac5f 100644 --- a/devel/libddwaf/files/patch-third_party-CMakeLists.txt +++ b/devel/libddwaf/files/patch-third_party-CMakeLists.txt @@ -1,4 +1,4 @@ ---- third_party/CMakeLists.txt.orig 2023-08-17 10:28:49 UTC +--- third_party/CMakeLists.txt.orig 2023-10-31 14:13:07 UTC +++ third_party/CMakeLists.txt @@ -15,24 +15,24 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wno-unused-parameter") @@ -99,7 +99,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug) set(LIBGTEST_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}gtestd${CMAKE_STATIC_LIBRARY_SUFFIX}) -@@ -81,54 +81,54 @@ else() +@@ -81,114 +81,114 @@ else() endif() @@ -165,39 +165,16 @@ add_dependencies(lib_gmock proj_gtest) set_target_properties(lib_gtest lib_gmock proj_gtest PROPERTIES EXCLUDE_FROM_ALL TRUE) --add_library(lib_injection STATIC -- libinjection/src/xss.c -- libinjection/src/libinjection_html5.c -- libinjection/src/libinjection_xss.c -- libinjection/src/libinjection_sqli.c) --target_include_directories(lib_injection INTERFACE ${PROJECT_SOURCE_DIR}/libinjection/src) --set_target_properties(lib_injection PROPERTIES POSITION_INDEPENDENT_CODE 1) -+#add_library(lib_injection STATIC -+# libinjection/src/xss.c -+# libinjection/src/libinjection_html5.c -+# libinjection/src/libinjection_xss.c -+# libinjection/src/libinjection_sqli.c) -+#target_include_directories(lib_injection INTERFACE ${PROJECT_SOURCE_DIR}/libinjection/src) -+#set_target_properties(lib_injection PROPERTIES POSITION_INDEPENDENT_CODE 1) - --add_library(lib_ac STATIC -- lua-aho-corasick/ac_fast.cxx -- lua-aho-corasick/ac_slow.cxx -- lua-aho-corasick/ac.cxx) --target_include_directories(lib_ac INTERFACE ${PROJECT_SOURCE_DIR}/lua-aho-corasick) --set_target_properties(lib_ac PROPERTIES POSITION_INDEPENDENT_CODE 1) -+#add_library(lib_ac STATIC -+# lua-aho-corasick/ac_fast.cxx -+# lua-aho-corasick/ac_slow.cxx -+# lua-aho-corasick/ac.cxx) -+#target_include_directories(lib_ac INTERFACE ${PROJECT_SOURCE_DIR}/lua-aho-corasick) -+#set_target_properties(lib_ac PROPERTIES POSITION_INDEPENDENT_CODE 1) - - add_library(lib_radix STATIC - radixlib/radixlib.c) -@@ -141,74 +141,74 @@ else () - set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) - endif() +-if (MSVC) +- set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc_static${CMAKE_STATIC_LIBRARY_SUFFIX}) +-else () +- set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) +-endif() ++#if (MSVC) ++# set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc_static${CMAKE_STATIC_LIBRARY_SUFFIX}) ++#else () ++# set(LIBUTF8PROC_FILENAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${CMAKE_STATIC_LIBRARY_SUFFIX}) ++#endif() -set(UTF8PROC_VERSION v2.7.0) -ExternalProject_Add(proj_utf8proc