aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Tassoux <contact@rt2.fr>2019-10-31 02:13:43 +0100
committerRobert Schumacher <roschuma@microsoft.com>2019-10-30 18:13:43 -0700
commit81fbbf8d964c111063b1e58dac61bc20c38e37f9 (patch)
tree81c3d4ab19bb7e5990ed7516a2dc14aa61f38465
parent34eff46c92019fe9e107779ec4b6ec3716194ab3 (diff)
downloadvcpkg-81fbbf8d964c111063b1e58dac61bc20c38e37f9.tar.gz
vcpkg-81fbbf8d964c111063b1e58dac61bc20c38e37f9.zip
[sol2] Use the single header release (#8776)
* [sol2] Use the single header release Using the single header release of the library is easier, faster to 'build', and is recommended by the documentation. It also fix the duplicated include folder issue of the previous port : <sol/sol/sol.hpp> can now be replaced with <sol/sol.hpp> as it should be. Is there any drawback about using the single header release that I am not seing? * [sol2] Re-enable cmake config files export * [sol2] Fix duplicated line
-rw-r--r--ports/sol2/CONTROL2
-rw-r--r--ports/sol2/portfile.cmake12
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL
index 44f5e1ada..42c2c736e 100644
--- a/ports/sol2/CONTROL
+++ b/ports/sol2/CONTROL
@@ -1,5 +1,5 @@
Source: sol2
-Version: 3.0.3-1
+Version: 3.0.3-2
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/portfile.cmake b/ports/sol2/portfile.cmake
index 23fd8bf8a..872f21839 100644
--- a/ports/sol2/portfile.cmake
+++ b/ports/sol2/portfile.cmake
@@ -17,7 +17,13 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sol2)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(
+ REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+ ${CURRENT_PACKAGES_DIR}/include
+)
+
+file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sol2 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)