Skip to content

Commit 881b39e

Browse files
authored
Merge pull request #40 from diffscope/fix/vcpkg
Fix .gitsubmodules and vcpkg overlay
2 parents 72b2ebd + e8015e8 commit 881b39e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/actions/initialize-vcpkg/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ runs:
3333
env:
3434
QT_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6
3535
Qt6_DIR: ${{ env.Qt_ROOT_DIR }}/lib/cmake/Qt6
36-
VCPKG_CMAKE_RELEASE_BUILD_TYPE: "RelWithDebInfo"
37-
VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_CMAKE_RELEASE_BUILD_TYPE;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET"
36+
VCPKG_KEEP_ENV_VARS: "QT_DIR;Qt6_DIR;VCPKG_BUILD_TYPE;MACOSX_DEPLOYMENT_TARGET"
3837
shell: pwsh
3938
run: |
4039
if (!(Test-Path $env:VCPKG_DEFAULT_BINARY_CACHE)) {

.gitmodules

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
[submodule "opendspx"]
3030
path = src/libs/3rdparty/opendspx
3131
url = ../../diffscope/opendspx.git
32-
[submodule "src/libs/3rdparty/dspxmodel"]
32+
33+
[submodule "dspxmodel"]
3334
path = src/libs/3rdparty/dspxmodel
34-
url = git@github.com:diffscope/dspxmodel.git
35+
url = ../../diffscope/dspxmodel.git

0 commit comments

Comments
 (0)