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

[saucer] Fix configure (#26783)

Browse Source 
* [saucer] Fix configure

Signed-off-by: JackBoosY <yuzaiyang@beyondsoft.com>

* version

Signed-off-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Jack·Boos·Yu 2022-09-15 19:16:25 +00:00 committed by GitHub
parent de20eeed0d
commit 8907350a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/saucer/fix-source-generation.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3800146..6200c78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer")
# --------------------------------------------------------------------------------------------------------
string(TOLOWER ${saucer_backend} saucer_backed_lower)
-configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp")
+configure_file("constants.hpp.in" "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp")
# --------------------------------------------------------------------------------------------------------
# Configure Library depending on options
@@ -91,6 +91,7 @@ include(FetchContent)
if (saucer_backend STREQUAL "Qt")
target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp")
target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp")
+ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp")
find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel)

4
ports/saucer/portfile.cmake
View File

@ -6,7 +6,9 @@ vcpkg_from_github(
REF 6ae482092cca4d4a408e6bdf24714153d9203797
SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0
HEAD_REF dev
PATCHES "unofficial-webview2.patch"
PATCHES
unofficial-webview2.patch
fix-source-generation.patch
)
vcpkg_cmake_configure(

1
ports/saucer/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "saucer",
"version": "1.0.1",
"port-version": 1,
"description": "Next-gen desktop apps with web-frontend in C++",
"homepage": "https://saucer.github.io/",
"license": "MIT",

2
versions/baseline.json
View File

@ -6554,7 +6554,7 @@
},
"saucer": {
"baseline": "1.0.1",
"port-version": 0
"port-version": 1
},
"sbp": {
"baseline": "3.4.10",

5
versions/s-/saucer.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3738770dd615f4e229cc0bf1e6704d3c0e9e001a",
"version": "1.0.1",
"port-version": 1
},
{
"git-tree": "66e466405fa3632e2b1539329a3ce71a65db5598",
"version": "1.0.1",