Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg baseline][saucer] Re-fix configure error #26820

Merged
merged 2 commits into from
Sep 19, 2022
Merged

[vcpkg baseline][saucer] Re-fix configure error #26820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08df096
[sacuer] Re-fix configure error
Sep 16, 2022
db4a9d8
version
Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/saucer/fix-source-generation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3800146..6200c78 100644
index 3800146..61a9e60 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_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/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")
+ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp")

find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel)
2 changes: 1 addition & 1 deletion ports/saucer/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "saucer",
"version": "1.0.1",
"port-version": 1,
"port-version": 2,
"description": "Next-gen desktop apps with web-frontend in C++",
"homepage": "https://saucer.github.io/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6558,7 +6558,7 @@
},
"saucer": {
"baseline": "1.0.1",
"port-version": 1
"port-version": 2
},
"sbp": {
"baseline": "3.4.10",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/saucer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce7e88eac61c5e370dbf6d5dc7ad56dbdded879d",
"version": "1.0.1",
"port-version": 2
},
{
"git-tree": "3738770dd615f4e229cc0bf1e6704d3c0e9e001a",
"version": "1.0.1",
Expand Down