mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 14:07:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sol2] update to 2.20.4 and remove deprecated patchs (#3800)

Browse Source 
* [sol2] update to 2.20.4 and remove deprecated patchs

* [sol2] remove unecessary commentary
This commit is contained in:
Sztergbaum Roman 2018-06-27 21:22:43 +00:00 committed by Robert Schumacher
parent 9e9fc7a9b3
commit 898e3e3710
4 changed files with 3 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/sol2/CONTROL
View File

@ -1,3 +1,3 @@
Source: sol2
Version: 2.20.3-1
Version: 2.20.4
Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great

7
ports/sol2/portfile.cmake
View File

@ -3,12 +3,9 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ThePhD/sol2
REF v2.20.3
SHA512 f1d39a6762c7c9c40bffd08129a80c4c8dd70ffcaadc195cbcd681471e6978176d0ae06d4b8db6aabc05b0ae2670c10bd287b9e859ec7810f2441c3c6c8fe521
REF v2.20.4
SHA512 dacacf57da3d1be3f20542ba83676e247a0d5815d0ee5dbfdbe996ffa264a5aaa71d7e5088088b0f1b41001f681d3c81339fc3f1ba394095eeaef4cb9376499a
HEAD_REF develop
PATCHES
${CMAKE_CURRENT_LIST_DIR}/sol2_fix_targets.patch
${CMAKE_CURRENT_LIST_DIR}/sol2_fix_install_interface.patch
)
vcpkg_configure_cmake(

22
ports/sol2/sol2_fix_install_interface.patch
View File

@ -1,22 +0,0 @@
From d72b243c717159b2e44f2dc12d25752be578e2ec Mon Sep 17 00:00:00 2001
From: Roman Sztergbaum <roman.sztergbaum@epitech.eu>
Date: Sat, 23 Jun 2018 10:43:51 +0200
Subject: [PATCH] fix install interface
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abd298f8..ba52ded8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ CMAKE_DEPENDENT_OPTION(TESTS_DYNAMIC_LOADING_EXAMPLES "Enable build of dynamic l
add_library(sol2 INTERFACE)
target_include_directories(sol2 INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include/sol>)
+ $<INSTALL_INTERFACE:include/sol> $<INSTALL_INTERFACE:include>)
# # Version configurations
configure_package_config_file(

39
ports/sol2/sol2_fix_targets.patch
View File

@ -1,39 +0,0 @@
From c53fa6d2b5f59d737b830021eb0872622b2058a2 Mon Sep 17 00:00:00 2001
From: Roman Sztergbaum <roman.sztergbaum@epitech.eu>
Date: Fri, 22 Jun 2018 22:02:11 +0200
Subject: [PATCH] fix sol2-config.cmake.in
---
cmake/sol2-config.cmake.in | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
index 9c69beb4..c15c0e5d 100644
--- a/cmake/sol2-config.cmake.in
+++ b/cmake/sol2-config.cmake.in
@@ -26,13 +26,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
-get_target_property(SOL_INCLUDE_DIRS
- sol2 INTERFACE_INCLUDE_DIRECTORIES)
+if (TARGET sol2)
+ get_target_property(SOL2_INCLUDE_DIRS
+ sol2 INTERFACE_INCLUDE_DIRECTORIES)
+ set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
+ set(SOL2_LIBRARIES sol2)
+endif()
-get_target_property(SOL_SINGLE_INCLUDE_DIRS
- sol2_single INTERFACE_INCLUDE_DIRECTORIES)
-
-set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
-set_and_check(SOL2_INCLUDE_DIRS "${SOL2_SINGLE_INCLUDE_DIRS}")
-set(SOL2_LIBRARIES sol2)
-set(SOL2_LIBRARIES_SINGLE sol2_single)
+if(TARGET sol2_single)
+ get_target_property(SOL_SINGLE_INCLUDE_DIRS
+ sol2_single INTERFACE_INCLUDE_DIRECTORIES)
+ set_and_check(SOL2_INCLUDE_DIRS "${SOL2_SINGLE_INCLUDE_DIRS}")
+ set(SOL2_LIBRARIES_SINGLE sol2_single)
+endif()