Skip to content

Fix .gitsubmodules and vcpkg overlay #40

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

Open
SineStriker wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

Fix .gitsubmodules and vcpkg overlay #40

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
86785f4
Fix .gitsubmodules and vcpkg overlay
SineStriker Aug 17, 2026
e8015e8
Fix CI error
SineStriker Aug 17, 2026
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
3 changes: 1 addition & 2 deletions .github/actions/initialize-vcpkg/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ runs:
env:
QT_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6
Qt6_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6
VCPKG_CMAKE_RELEASE_BUILD_TYPE: "RelWithDebInfo"
VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_CMAKE_RELEASE_BUILD_TYPE;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET"
VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET"
shell: pwsh
run: |
if (!(Test-Path $env:VCPKG_DEFAULT_BINARY_CACHE)) {
Expand Down
5 changes: 3 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
[submodule "opendspx"]
path = src/libs/3rdparty/opendspx
url = ../../diffscope/opendspx.git
[submodule "src/libs/3rdparty/dspxmodel"]

[submodule "dspxmodel"]
path = src/libs/3rdparty/dspxmodel
url = git@github.com:diffscope/dspxmodel.git
url = ../../diffscope/dspxmodel.git
2 changes: 1 addition & 1 deletion scripts/vcpkg
Open in desktop
Submodule vcpkg updated 9 files
+0 −14 ports/vcpkg-cmake/portfile.cmake
+0 −3 ports/vcpkg-cmake/vcpkg-port-config.cmake
+0 −6 ports/vcpkg-cmake/vcpkg.json
+0 −103 ports/vcpkg-cmake/vcpkg_cmake_build.cmake
+0 −365 ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
+0 −21 ports/vcpkg-cmake/vcpkg_cmake_install.cmake
+6 −1 triplets/arm64-osx.cmake
+7 −1 triplets/x64-linux.cmake
+6 −1 triplets/x64-osx.cmake
Loading