mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 11:49:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sol2]Disable export namespace to fix usage issue. (#8243)

Browse Source 
* [sol2]Disable export namespace to fix usage issue.

* [sol2]Re-fix namespace issue.
This commit is contained in:
JackBoosY 2019-09-26 20:43:46 +08:00 committed by Curtis J Bezault
parent c7b705fc05
commit 13476c9c93
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/sol2/CONTROL
View File

@ -1,5 +1,5 @@
Source: sol2
Version: 3.0.3
Version: 3.0.3-1
Homepage: https://github.com/ThePhD/sol2
Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great
Build-Depends: lua (windows)

19
ports/sol2/fix-namespace.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
index 70c448d..7965bc6 100644
--- a/cmake/sol2-config.cmake.in
+++ b/cmake/sol2-config.cmake.in
@@ -26,11 +26,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake")
MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR})
-if (TARGET sol2)
+if (TARGET sol2::sol2)
get_target_property(SOL2_INCLUDE_DIRS
- sol2 INTERFACE_INCLUDE_DIRECTORIES)
+ sol2::sol2 INTERFACE_INCLUDE_DIRECTORIES)
set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}")
- set(SOL2_LIBRARIES sol2)
+ set(SOL2_LIBRARIES sol2::sol2)
endif()
if(TARGET sol2_single)

1
ports/sol2/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_github(
REF v3.0.3
SHA512 8c8f36eaedb76863106ecd24543b82c76a2fac15e86bfaf0e724b726e89d4238adf9eea8abefe0add5ee17e45b1a73ee24496f691b79c15dca85e2cfde8762b4
HEAD_REF develop
PATCHES fix-namespace.patch
)
vcpkg_configure_cmake(