Skip to content

Commit 092b6af

Browse files
authored
Fix botched build from PR 3381, command line utils not installed (#3390)
Cut/paste error inadvertently deleted a critical cmake line that I wasn't intending to alter or remove, that resulted in the command line utilities not being tagged for part of the install step. Oops!
1 parent 7fc5199 commit 092b6af

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/build-scripts/ci-test.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# any command in it fails. This is crucial for CI tests.
55
set -ex
66

7-
$OpenImageIO_ROOT/bin/oiiotool --help || true
7+
$OpenImageIO_ROOT/bin/oiiotool --help
88

99
echo "Parallel test " ${CTEST_PARALLEL_LEVEL}
1010
pushd build

src/cmake/fancy_add_executable.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ macro (fancy_add_executable)
5151
target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
5252
endif ()
5353
set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
54+
check_is_enabled (INSTALL_${_target_NAME} _target_NAME_INSTALL_enabled)
5455
if (CMAKE_UNITY_BUILD)
5556
set_source_files_properties(${_target_SRC} PROPERTIES
5657
UNITY_GROUP ${_target_NAME})

0 commit comments

Comments
 (0)