diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-07-19 12:11:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 12:11:33 -0700 |
| commit | fb84265be2166d4d80381823bbcac58dc136c51b (patch) | |
| tree | 7cdec00c88d1be4a836a1c49bd6567c94fb2c527 /ports | |
| parent | 111220b3cf3311744369425d5c323a0f17941076 (diff) | |
| download | vcpkg-fb84265be2166d4d80381823bbcac58dc136c51b.tar.gz vcpkg-fb84265be2166d4d80381823bbcac58dc136c51b.zip | |
[pistache] Build fixes from 2021-07-18 (#18994)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/pistache/disable-warnings.patch | 12 | ||||
| -rw-r--r-- | ports/pistache/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/pistache/vcpkg.json | 1 |
3 files changed, 19 insertions, 5 deletions
diff --git a/ports/pistache/disable-warnings.patch b/ports/pistache/disable-warnings.patch new file mode 100644 index 000000000..717937ff8 --- /dev/null +++ b/ports/pistache/disable-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e051efa..9d65174 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,6 @@ project (pistache
+
+ include(GNUInstallDirs)
+
+-add_compile_options(-Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
+
+ include(CheckAtomic)
diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index 409c0e0f6..9c50d2f00 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -10,11 +10,12 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-debug-empty.patch + disable-warnings.patch ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA ) vcpkg_install_cmake() @@ -22,8 +23,8 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index 30a1bf4ed..0cac84c44 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pistache", "version-date": "2021-03-31", + "port-version": 1, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", "supports": "linux" |