Skip to content

Commit 0e3ce60

Browse files
committed
Absolute path for UI Base in Github action.
1 parent c62aaa3 commit 0e3ce60

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

.github/workflows/build-and-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
shell: pwsh
5656
run: |
5757
cmake --preset vs2022-windows `
58-
"-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64;.\uibase\install\lib\cmake" `
58+
"-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64;${{ github.workspace }}\uibase\install\lib\cmake" `
5959
-DPLUGIN_PYTHON_TESTING=ON
6060
6161
- name: Build Plugin Python

CMakePresets.json

+14
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,20 @@
5050
"inherits": ["cmake-dev", "vcpkg-dev"],
5151
"name": "vs2022-windows",
5252
"toolset": "v143"
53+
},
54+
{
55+
"cacheVariables": {
56+
"VCPKG_ENV_PASSTHROUGH": {
57+
"type": "STRING",
58+
"value": "QT_ROOT"
59+
},
60+
"VCPKG_MANIFEST_FEATURES": {
61+
"type": "STRING",
62+
"value": "testing;standalone"
63+
}
64+
},
65+
"inherits": ["vs2022-windows"],
66+
"name": "vs2022-windows-standalone"
5367
}
5468
],
5569
"buildPresets": [

vcpkg-configuration.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"kind": "git",
1616
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
1717
"baseline": "456d80419c7193bcf851d4c8b2075e0a2761053f",
18-
"packages": ["mo2-cmake", "pybind11"]
18+
"packages": ["mo2-*", "pybind11", "spdlog"]
1919
}
20-
]
20+
],
21+
"overlay-ports": ["./ports"]
2122
}

vcpkg.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
"dependencies": ["mo2-cmake", "pybind11"],
33
"features": {
44
"testing": {
5-
"description": "Build UI Base tests.",
5+
"description": "Build Plugin Python tests.",
66
"dependencies": ["gtest"]
7+
},
8+
"standalone": {
9+
"description": "Build Plugin Python standalone.",
10+
"dependencies": ["mo2-uibase"]
711
}
812
}
913
}

0 commit comments

Comments
 (0)