Skip to content

Commit 1186002

Browse files
authored
Merge pull request #58 from SLM-Audio/syl/rename-test-macro
Rename TESTS to MOSTLY_HARMLESS_TESTS and EXAMPLES to MOSTLY_HARMLESS_EXAMPLES
2 parents be7e700 + a3aacb4 commit 1186002

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/framework-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
branches:
44
- main
55
pull_request:
6-
types: [opened, edited, reopened]
6+
types: [ opened, edited, reopened ]
77
jobs:
88
tests-windows:
99
runs-on: windows-latest
@@ -14,7 +14,7 @@ jobs:
1414
- name: Configure and Build
1515
uses: threeal/cmake-action@main
1616
with:
17-
options: "TESTS=ON"
17+
options: "MOSTLY_HARMLESS_TESTS=ON"
1818
build-args: "--target mostly-harmless-tests"
1919
- name: Run tests
2020
run: "./build/debug/mostly-harmless-tests.exe"
@@ -28,7 +28,7 @@ jobs:
2828
- name: Configure and Build
2929
uses: threeal/cmake-action@main
3030
with:
31-
options: "TESTS=ON"
31+
options: "MOSTLY_HARMLESS_TESTS=ON"
3232
build-args: "--target mostly-harmless-tests"
3333
- name: Run tests
3434
run: "./build/mostly-harmless-tests"

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,7 @@ install(
149149
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
150150
)
151151

152-
# install(
153-
# EXPORT MostlyHarmless
154-
# NAMESPACE slma::
155-
# FILE Targets.cmake
156-
# DESTINATION "${MOSTLYHARMLESS_INSTALL_DEST}"
157-
# COMPONENT MostlyHarmless
158-
# )
159-
if (TESTS)
152+
if (MOSTLY_HARMLESS_TESTS)
160153
set(CMAKE_DEBUG_POSTFIX "")
161154
FetchContent_Declare(Catch2
162155
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
@@ -172,7 +165,7 @@ endif ()
172165
if (${PROJECT_IS_TOP_LEVEL})
173166
add_subdirectory(docs)
174167
endif ()
175-
if (${EXAMPLES})
168+
if (${MOSTLY_HARMLESS_EXAMPLES})
176169
add_subdirectory(examples/gain)
177170
add_subdirectory(examples/delay)
178171
add_subdirectory(examples/synth)

0 commit comments

Comments
 (0)