Skip to content

Commit 6ed0c4f

Browse files
committed
Fix nointrospection dependencies
1 parent d4e8457 commit 6ed0c4f

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.github/workflows/linux.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,17 @@ jobs:
3333
run: cmake -E make_directory build
3434

3535
- name: Configure CMake
36-
working-directory: build
37-
run: cmake -G Ninja ${{ github.workspace }}
36+
shell: pwsh
37+
working-directory: build/
38+
run: |
39+
$cmakeBuildType = '${{ matrix.config }}'
40+
41+
cmake "-DCMAKE_BUILD_TYPE=$cmakeBuildType" -G Ninja ${{ github.workspace }}
3842
3943
- name: Build
40-
working-directory: build
41-
run: cmake --build . --config ${{ matrix.config }} -j -v
44+
working-directory: build/
45+
run: cmake --build . -j -v
4246

4347
- name: Test
44-
working-directory: build
45-
run: ctest -C ${{ matrix.config }} --output-on-failure
48+
working-directory: build/
49+
run: ctest --output-on-failure

.github/workflows/macos.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ jobs:
4141
working-directory: build/
4242
run: |
4343
$vcpkgToolchain = Join-Path '../vcpkg' './scripts/buildsystems/vcpkg.cmake' -Resolve
44+
$cmakeBuildType = '${{ matrix.config }}'
4445
45-
cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" ${{ github.workspace }}
46+
cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}
4647
4748
- name: Build
4849
working-directory: build/
49-
run: cmake --build . --config ${{ matrix.config }} -v
50+
run: cmake --build . -j -v
5051

5152
- name: Test
5253
working-directory: build/
53-
run: ctest -C ${{ matrix.config }} --output-on-failure
54+
run: ctest --output-on-failure

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
5757
- name: Build
5858
working-directory: build/
59-
run: cmake --build . --config ${{ matrix.config }} -v
59+
run: cmake --build . --config ${{ matrix.config }} -j -v
6060

6161
- name: Test
6262
working-directory: build/
63-
run: ctest -C ${{ matrix.config }} --output-on-failure
63+
run: ctest --output-on-failure

samples/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ if(GRAPHQL_UPDATE_SAMPLES)
9999
DEPENDS
100100
${CMAKE_CURRENT_BINARY_DIR}/unified/TodaySchema.cpp
101101
${CMAKE_CURRENT_BINARY_DIR}/unified/TodaySchema.h
102+
${CMAKE_CURRENT_BINARY_DIR}/unified_nointrospection/TodaySchema.cpp
103+
${CMAKE_CURRENT_BINARY_DIR}/unified_nointrospection/TodaySchema.h
102104
${CMAKE_CURRENT_BINARY_DIR}/separate/today_schema_files
105+
${CMAKE_CURRENT_BINARY_DIR}/separate_nointrospection/today_schema_files
103106
${CMAKE_CURRENT_BINARY_DIR}/validation/ValidationSchema.cpp
104107
${CMAKE_CURRENT_BINARY_DIR}/validation/ValidationSchema.h
105108
COMMENT "Updating sample files")

0 commit comments

Comments
 (0)