diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-09-26 20:43:46 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-26 05:43:46 -0700 |
| commit | 13476c9c93cb2168d90985be0e267b6e33a4ea37 (patch) | |
| tree | 0b022b5d7b575d1a39425b3bd6b41a3a60bfcacf | |
| parent | c7b705fc057ccf6571110378b05d0230d6e6f2a6 (diff) | |
| download | vcpkg-13476c9c93cb2168d90985be0e267b6e33a4ea37.tar.gz vcpkg-13476c9c93cb2168d90985be0e267b6e33a4ea37.zip | |
[sol2]Disable export namespace to fix usage issue. (#8243)
* [sol2]Disable export namespace to fix usage issue.
* [sol2]Re-fix namespace issue.
| -rw-r--r-- | ports/sol2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sol2/fix-namespace.patch | 19 | ||||
| -rw-r--r-- | ports/sol2/portfile.cmake | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL index 5a93c3c64..44f5e1ada 100644 --- a/ports/sol2/CONTROL +++ b/ports/sol2/CONTROL @@ -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)
\ No newline at end of file diff --git a/ports/sol2/fix-namespace.patch b/ports/sol2/fix-namespace.patch new file mode 100644 index 000000000..bcce158db --- /dev/null +++ b/ports/sol2/fix-namespace.patch @@ -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) diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake index 2516549dd..23fd8bf8a 100644 --- a/ports/sol2/portfile.cmake +++ b/ports/sol2/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF v3.0.3 SHA512 8c8f36eaedb76863106ecd24543b82c76a2fac15e86bfaf0e724b726e89d4238adf9eea8abefe0add5ee17e45b1a73ee24496f691b79c15dca85e2cfde8762b4 HEAD_REF develop + PATCHES fix-namespace.patch ) vcpkg_configure_cmake( |