mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:28:59 +08:00
[licensepp] Update to 2020-11-24 (#30663)
This commit is contained in:
parent
b91728fe5f
commit
aebac86646
@ -1,38 +0,0 @@
|
||||
From 5a7cbbe8423ee3daf533bcc1fefa7d1f1315634c Mon Sep 17 00:00:00 2001
|
||||
From: Nicole Mazzuca <mazzucan@outlook.com>
|
||||
Date: Wed, 23 Sep 2020 09:43:37 -0700
|
||||
Subject: [PATCH 2/2] fix cmake
|
||||
|
||||
Remove this patch if https://github.com/amrayn/licensepp/pull/33 is merged
|
||||
---
|
||||
CMakeLists.txt | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b2c39d1..0d49632 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -35,10 +35,8 @@ if (APPLE)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if(MSVC)
|
||||
- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ")
|
||||
-else()
|
||||
- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ")
|
||||
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
|
||||
endif()
|
||||
|
||||
# Check for cryptopp (static)
|
||||
@@ -73,6 +71,7 @@ endif()
|
||||
set_target_properties (licensepp-lib PROPERTIES
|
||||
VERSION ${LICENSEPP_SOVERSION}
|
||||
)
|
||||
+target_include_directories(licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
target_link_libraries (licensepp-lib
|
||||
${CRYPTOPP_LIBRARIES}
|
||||
)
|
||||
--
|
||||
2.24.3 (Apple Git-128)
|
||||
|
26
ports/licensepp/0002-fix-compilation-macos.patch
Normal file
26
ports/licensepp/0002-fix-compilation-macos.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From b0e09221f5f782e6dc2dedf197eba8064095edcd Mon Sep 17 00:00:00 2001
|
||||
From: Michael Migliore <michael.migliore@z-emotion.com>
|
||||
Date: Thu, 6 Apr 2023 09:36:17 +0200
|
||||
Subject: [PATCH] Fix compilation on macOS
|
||||
|
||||
---
|
||||
src/json-object.h | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/src/json-object.h b/src/json-object.h
|
||||
index 712e9a0..9764514 100644
|
||||
--- a/src/json-object.h
|
||||
+++ b/src/json-object.h
|
||||
@@ -80,12 +80,6 @@ class JsonObject
|
||||
return get<bool>(key, defaultValue);
|
||||
}
|
||||
|
||||
- inline const char* getCString(const std::string& key,
|
||||
- const char* defaultValue = "") const
|
||||
- {
|
||||
- return getString(key, defaultValue).c_str();
|
||||
- }
|
||||
-
|
||||
inline bool hasKey(const std::string& key) const
|
||||
{
|
||||
return m_root.count(key) > 0;
|
@ -3,12 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO amrayn/licensepp
|
||||
REF 0b6d669c0b323be004f73d8c811d38158ce8c0c7
|
||||
SHA512 2161575815d8ff49110d7c2823662ba30d9f1ca2eb6be6dad1ee0807fb3fa9f28483839a133c9d380035254df7c452f8d6fa7f17fd4f29acd8b9bfbbda059291
|
||||
REF e9501da1470a3bd29254975577d806612a3d3e3c
|
||||
SHA512 6f70904d1214036af3891dc54f71ea2052acd8f60c277dbd2a5f3190ce4610771f36108d4d5a123c0e7312aded410d652460018d74586fc4f41b05fabb6100bd
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-use-old-pem-pack.patch
|
||||
0002-fix-cmake.patch
|
||||
0002-fix-compilation-macos.patch
|
||||
)
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake")
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "licensepp",
|
||||
"version-date": "2020-05-19",
|
||||
"port-version": 4,
|
||||
"version-date": "2020-11-24",
|
||||
"description": "Cross platform software licensing library",
|
||||
"homepage": "https://github.com/zuhd-org/licensepp",
|
||||
"supports": "!uwp",
|
||||
|
@ -4801,8 +4801,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"licensepp": {
|
||||
"baseline": "2020-05-19",
|
||||
"port-version": 4
|
||||
"baseline": "2020-11-24",
|
||||
"port-version": 0
|
||||
},
|
||||
"lilv": {
|
||||
"baseline": "0.24.10",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "00707f2d2df73ed1303b493178c791ef41996505",
|
||||
"version-date": "2020-11-24",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "242d2988823856d4bec19a6a8844fb0d6a30eb33",
|
||||
"version-date": "2020-05-19",
|
||||
|
Loading…
Reference in New Issue
Block a user