Skip to content

Commit 035b77b

Browse files
committed
Use always Ninja generator for find-package-test
1 parent c1e29c3 commit 035b77b

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/clang.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
cxx_config:
1616
- { std: 20, import_std: "OFF" }
1717
- { std: 23, import_std: "ON" }
18+
build_type: [debug, release]
1819

1920
runs-on: ubuntu-latest
2021

@@ -47,9 +48,9 @@ jobs:
4748
- name: Build
4849
env:
4950
PATH: $HOME/.local/bin:$PATH
50-
run: cmake --build --preset linux-clang-debug
51+
run: cmake --build --preset linux-clang-${{ matrix.build_type }}
5152

5253
- name: Test
5354
env:
5455
PATH: $HOME/.local/bin:$PATH
55-
run: ctest --preset linux-clang-debug
56+
run: ctest --preset linux-clang-${{ matrix.build_type }}

.github/workflows/gcc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
cxx_config:
1616
- { std: 20, import_std: "OFF" }
1717
- { std: 23, import_std: "ON" }
18+
build_type: [debug, release]
1819

1920
runs-on: ubuntu-latest
2021

@@ -46,9 +47,9 @@ jobs:
4647
- name: Build
4748
env:
4849
PATH: $HOME/.local/bin:$PATH
49-
run: cmake --build --preset linux-gcc-debug
50+
run: cmake --build --preset linux-gcc-${{ matrix.build_type }}
5051

5152
- name: Test
5253
env:
5354
PATH: $HOME/.local/bin:$PATH
54-
run: ctest --preset linux-gcc-debug
55+
run: ctest --preset linux-gcc-${{ matrix.build_type }}

src/tests/unit/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ if(CMAKE_SKIP_INSTALL_RULES)
147147
return()
148148
endif()
149149

150-
# if(LINUX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
151-
# return()
152-
# endif()
153-
154150
# test if the targets are usable from the install directory
155151
# NOTE: should be tested in Debug and Release! CK
156152
add_test(
@@ -165,8 +161,9 @@ add_test(
165161
${CMAKE_CTEST_COMMAND} # --verbose
166162
--output-on-failure -C $<CONFIG> --build-and-test
167163
"${CMAKE_SOURCE_DIR}/src/examples"
168-
"${CMAKE_CURRENT_BINARY_DIR}/find-package-test" --build-generator
169-
${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
164+
"${CMAKE_CURRENT_BINARY_DIR}/find-package-test"
165+
--build-generator "Ninja" # XXX ${CMAKE_GENERATOR}
166+
--build-makeprogram ${CMAKE_MAKE_PROGRAM} #
170167
--build-options #
171168
"-D ASIO_IMPORT_STD=${ASIO_IMPORT_STD}" #
172169
"-D CMAKE_BUILD_TYPE=$<CONFIG>" #

0 commit comments

Comments
 (0)