mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 19:59:07 +08:00
31e85fd493
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
181 lines
5.2 KiB
Diff
181 lines
5.2 KiB
Diff
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
|
index 56adfe0a..4f81aa5a 100644
|
|
--- a/fizz/CMakeLists.txt
|
|
+++ b/fizz/CMakeLists.txt
|
|
@@ -50,53 +50,32 @@ find_package(folly CONFIG REQUIRED)
|
|
find_package(fmt CONFIG REQUIRED)
|
|
|
|
find_package(OpenSSL REQUIRED)
|
|
-find_package(Glog REQUIRED)
|
|
-find_package(DoubleConversion REQUIRED)
|
|
+find_package(glog CONFIG REQUIRED)
|
|
+find_package(double-conversion CONFIG REQUIRED)
|
|
find_package(Threads REQUIRED)
|
|
-find_package(Zstd REQUIRED)
|
|
if (UNIX AND NOT APPLE)
|
|
find_package(Librt)
|
|
endif()
|
|
|
|
include(CheckAtomic)
|
|
|
|
-find_package(Sodium REQUIRED)
|
|
+find_package(unofficial-sodium CONFIG REQUIRED)
|
|
|
|
SET(FIZZ_SHINY_DEPENDENCIES "")
|
|
SET(FIZZ_LINK_LIBRARIES "")
|
|
SET(FIZZ_INCLUDE_DIRECTORIES "")
|
|
|
|
-find_package(gflags CONFIG QUIET)
|
|
-if (gflags_FOUND)
|
|
- message(STATUS "Found gflags from package config")
|
|
- if (TARGET gflags-shared)
|
|
- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags-shared)
|
|
- elseif (TARGET gflags)
|
|
- list(APPEND FIZZ_SHINY_DEPENDENCIES gflags)
|
|
- else()
|
|
- message(FATAL_ERROR "Unable to determine the target name for the GFlags package.")
|
|
- endif()
|
|
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARIES})
|
|
- list(APPEND CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
|
|
-else()
|
|
- find_package(Gflags REQUIRED MODULE)
|
|
- list(APPEND FIZZ_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
|
|
- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
|
|
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
|
|
- list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
|
|
+find_package(zstd CONFIG REQUIRED)
|
|
+if(TARGET zstd::libzstd_shared)
|
|
+ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_shared)
|
|
+elseif(TARGET zstd::libzstd_static)
|
|
+ list(APPEND FIZZ_LINK_LIBRARIES zstd::libzstd_static)
|
|
endif()
|
|
|
|
+find_package(gflags CONFIG REQUIRED)
|
|
find_package(ZLIB REQUIRED)
|
|
|
|
-find_package(Libevent CONFIG QUIET)
|
|
-if(TARGET event)
|
|
- message(STATUS "Found libevent from package config")
|
|
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
|
|
-else()
|
|
- find_package(Libevent MODULE REQUIRED)
|
|
- list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
|
|
- list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
|
|
-endif()
|
|
+find_package(Libevent CONFIG REQUIRED)
|
|
|
|
find_package(liboqs CONFIG)
|
|
if (liboqs_FOUND)
|
|
@@ -265,30 +244,25 @@ target_include_directories(
|
|
$<BUILD_INTERFACE:${FIZZ_BASE_DIR}>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated>
|
|
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
|
|
- ${FOLLY_INCLUDE_DIR}
|
|
- ${OPENSSL_INCLUDE_DIR}
|
|
- ${sodium_INCLUDE_DIR}
|
|
- ${ZSTD_INCLUDE_DIR}
|
|
PRIVATE
|
|
- ${GLOG_INCLUDE_DIRS}
|
|
${FIZZ_INCLUDE_DIRECTORIES}
|
|
- ${DOUBLE_CONVERSION_INCLUDE_DIR}
|
|
)
|
|
|
|
|
|
target_link_libraries(fizz
|
|
PUBLIC
|
|
- ${FOLLY_LIBRARIES}
|
|
- ${OPENSSL_LIBRARIES}
|
|
- sodium
|
|
+ Folly::folly
|
|
+ OpenSSL::SSL
|
|
+ OpenSSL::Crypto
|
|
+ unofficial-sodium::sodium
|
|
Threads::Threads
|
|
ZLIB::ZLIB
|
|
- ${ZSTD_LIBRARY}
|
|
PRIVATE
|
|
- ${GLOG_LIBRARIES}
|
|
- ${GFLAGS_LIBRARIES}
|
|
+ glog::glog
|
|
+ gflags::gflags
|
|
${FIZZ_LINK_LIBRARIES}
|
|
- ${DOUBLE_CONVERSION_LIBRARY}
|
|
+ libevent::core
|
|
+ double-conversion::double-conversion
|
|
${CMAKE_DL_LIBS}
|
|
${LIBRT_LIBRARIES})
|
|
|
|
@@ -349,8 +323,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
|
|
SET(FIZZ_TEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
|
|
|
|
if(BUILD_TESTS)
|
|
- find_package(GMock 1.8.0 MODULE REQUIRED)
|
|
- find_package(GTest 1.8.0 MODULE REQUIRED)
|
|
+ find_package(GTest CONFIG REQUIRED)
|
|
endif()
|
|
|
|
add_library(fizz_test_support
|
|
@@ -363,20 +336,7 @@ add_library(fizz_test_support
|
|
target_link_libraries(fizz_test_support
|
|
PUBLIC
|
|
fizz
|
|
- ${LIBGMOCK_LIBRARIES}
|
|
- ${GLOG_LIBRARY}
|
|
-)
|
|
-
|
|
-target_compile_definitions(fizz_test_support
|
|
- PUBLIC
|
|
- ${LIBGMOCK_DEFINES}
|
|
-)
|
|
-
|
|
-target_include_directories(fizz_test_support
|
|
- SYSTEM
|
|
- PUBLIC
|
|
- ${LIBGMOCK_INCLUDE_DIR}
|
|
- ${LIBGTEST_INCLUDE_DIRS}
|
|
+ glog::glog
|
|
)
|
|
|
|
# export fizz headers and targets for unit tests utils
|
|
@@ -401,14 +361,12 @@ macro(add_gtest test_source test_name)
|
|
add_executable(${test_name} ${test_source} test/CMakeTestMain.cpp)
|
|
|
|
set_property(TARGET ${test_name} PROPERTY ENABLE_EXPORTS true)
|
|
- target_include_directories(
|
|
- ${test_name} PUBLIC ${LIBGMOCK_INCLUDE_DIR} ${LIBGTEST_INCLUDE_DIR})
|
|
- target_compile_definitions(${test_name} PUBLIC ${LIBGMOCK_DEFINES})
|
|
target_link_libraries(
|
|
${test_name}
|
|
fizz
|
|
fizz_test_support
|
|
- ${LIBGMOCK_LIBRARIES})
|
|
+ GTest::gtest
|
|
+ GTest::gmock)
|
|
|
|
if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
|
|
# GMOCK_MOCK_METHOD() will complain otherwise
|
|
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
|
index 679b0e61..8a4b189e 100644
|
|
--- a/fizz/cmake/fizz-config.cmake.in
|
|
+++ b/fizz/cmake/fizz-config.cmake.in
|
|
@@ -26,9 +26,18 @@ endif()
|
|
set(FIZZ_LIBRARIES fizz::fizz)
|
|
|
|
include(CMakeFindDependencyMacro)
|
|
-find_dependency(Sodium)
|
|
+find_dependency(unofficial-sodium CONFIG)
|
|
find_dependency(folly CONFIG)
|
|
find_dependency(ZLIB)
|
|
+find_dependency(Libevent CONFIG)
|
|
+find_dependency(fmt CONFIG)
|
|
+find_dependency(OpenSSL)
|
|
+find_dependency(glog CONFIG)
|
|
+find_dependency(double-conversion CONFIG)
|
|
+find_dependency(Threads)
|
|
+find_dependency(gflags CONFIG)
|
|
+find_dependency(zstd CONFIG)
|
|
+find_dependency(GTest CONFIG)
|
|
|
|
if (NOT fizz_FIND_QUIETLY)
|
|
message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
|