diff options
| author | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
|---|---|---|
| committer | grdowns <grdowns@microsoft.com> | 2019-06-28 17:32:12 -0700 |
| commit | e27fe911982284788e63f4a92339386554706a4b (patch) | |
| tree | e695af1d6733cea93a29adab73ff819430ff872e /ports/spdlog | |
| parent | 1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff) | |
| parent | 62ed7c17318b4f46109c2de73b7584fb04e85720 (diff) | |
| download | vcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'ports/spdlog')
| -rw-r--r-- | ports/spdlog/CONTROL | 7 | ||||
| -rw-r--r-- | ports/spdlog/fix-feature-export.patch | 14 | ||||
| -rw-r--r-- | ports/spdlog/portfile.cmake | 10 |
3 files changed, 30 insertions, 1 deletions
diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 801cd3697..aa5474709 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,9 @@ Source: spdlog -Version: 1.3.1 +Version: 1.3.1-1 +Homepage: https://github.com/gabime/spdlog Description: Very fast, header only, C++ logging library Build-Depends: fmt + +Feature: benchmark +Description: Use google benchmark +Build-Depends: benchmark
\ No newline at end of file diff --git a/ports/spdlog/fix-feature-export.patch b/ports/spdlog/fix-feature-export.patch new file mode 100644 index 000000000..ad1239fd7 --- /dev/null +++ b/ports/spdlog/fix-feature-export.patch @@ -0,0 +1,14 @@ +diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt +index 3c4a3f9..3bc3813 100644 +--- a/bench/CMakeLists.txt ++++ b/bench/CMakeLists.txt +@@ -46,3 +46,8 @@ add_executable(formatter-bench formatter-bench.cpp) + target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads) + + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs") ++ ++install(TARGETS bench async_bench latency ++ RUNTIME DESTINATION tools/spdlog ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) +\ No newline at end of file diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 530e8b084..37cd8644f 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,5 +1,6 @@ #header-only library include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog @@ -8,19 +9,28 @@ vcpkg_from_github( HEAD_REF v1.x PATCHES disable-master-project-check.patch + fix-feature-export.patch ) +set(SPDLOG_USE_BENCHMARK OFF) +if("benchmark" IN_LIST FEATURES) + set(SPDLOG_USE_BENCHMARK ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DSPDLOG_FMT_EXTERNAL=ON + -DSPDLOG_BUILD_BENCH=${SPDLOG_USE_BENCHMARK} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/spdlog) +vcpkg_copy_pdbs() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) |