Skip to content

Commit 46ae313

Browse files
committed
[Build] Error configure if openassetio-traitgen missing
Also rewords the previous status message to use the same case as the command to aid debugging. Closes OpenAssetIO#36 Signed-off-by: Tom Cowland <[email protected]>
1 parent 023ec5c commit 46ae313

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@ endif ()
5555
# directly mimic a non-generated project, and lowers risk that changes
5656
# to the library structure later on will encounter issues caused by the
5757
# generative nature of the project.
58-
message("Generating Traits with OpenAssetIO-TraitGen")
58+
message("Generating Traits with openassetio-traitgen")
5959
# Mark the traits source as a configure dependency by copying it to the
6060
# binary dir, and use that file to run traitgen from.
6161
# This means if the source traits file is changed, configure will rerun.
6262
configure_file(${CMAKE_CURRENT_LIST_DIR}/traits.yml ${PROJECT_BINARY_DIR}/traits.yml)
6363
execute_process(COMMAND openassetio-traitgen ${PROJECT_BINARY_DIR}/traits.yml
64-
-o ${PROJECT_BINARY_DIR} -g cpp)
64+
-o ${PROJECT_BINARY_DIR} -g cpp
65+
COMMAND_ERROR_IS_FATAL ANY
66+
COMMAND_ECHO STDERR)
6567

6668
add_library(openassetio-mediacreation INTERFACE)
6769
# add alias so the project can be used with add_subdirectory

RELEASE_NOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ v1.0.0-alpha.x
88

99
- Updated `openassetio-traitgen` to `v1.0.0-alpha.6`.
1010

11+
### Bug fixes
12+
13+
- CMake will now fail at the configure stage if the
14+
`openassetio-traitgen` command is not available.
15+
[#36](https://github.com/OpenAssetIO/OpenAssetIO-MediaCreation/issues/36)
16+
1117
v1.0.0-alpha.4
1218
--------------
1319

0 commit comments

Comments
 (0)