Rename OPENEXR_BUILD_UTILS option to OPENEXR_BUILD_TOOLS (AcademySoft…

…wareFoundation#1056) For consistency with OPENEXR_INSTALL_TOOLS. The terms "util" also appears in the "OpenEXRUtil" library, where it means something entirely different from "utility programs". This establishes that the programs are called "tools". This still leaves the inconsistency that the source for the "tool" programs is in the "bin" directory, but that still seems reasonable. Signed-off-by: Cary Phillips <[email protected]>
michaeldsmith · Jun 22, 2021 · 41e7a48 · 41e7a48
1 parent 0d7e229
commit 41e7a48
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/analysis_workflow.yml b/.github/workflows/analysis_workflow.yml
@@ -54,7 +54,7 @@ jobs:
                 -DCMAKE_EXE_LINKER_FLAGS="-lgcov" \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS='OFF' \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' \
                 -DOPENEXR_ENABLE_THREADING='ON'
         working-directory: _build
@@ -124,7 +124,7 @@ jobs:
                 -DCMAKE_CXX_STANDARD=14 \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS='OFF' \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' \
                 -DOPENEXR_ENABLE_THREADING='ON'
         working-directory: _build
@@ -185,7 +185,7 @@ jobs:
                 -DCMAKE_CXX_STANDARD=14 \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS='OFF' \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='ON' \
                 -DOPENEXR_ENABLE_THREADING='ON'
         working-directory: _build

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -308,7 +308,7 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' \
                 -DOPENEXR_ENABLE_THREADING=${{ matrix.threads-enabled }}
         working-directory: _build
@@ -411,7 +411,7 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF'
         working-directory: _build
       - name: Build
@@ -513,7 +513,7 @@ jobs:
                 -DCMAKE_CXX_FLAGS=${{ matrix.cxx-flags }} \
                 -DCMAKE_VERBOSE_MAKEFILE:BOOL='OFF' \
                 -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} \
-                -DOPENEXR_BUILD_UTILS='ON' \
+                -DOPENEXR_BUILD_TOOLS='ON' \
                 -DOPENEXR_RUN_FUZZ_TESTS='OFF' 
         shell: bash
         working-directory: _build

diff --git a/Contrib/NuGet/OpenEXR-msvc-x64-build.nuget.bat b/Contrib/NuGet/OpenEXR-msvc-x64-build.nuget.bat
@@ -59,7 +59,7 @@ cmake -G %cmake_platform% ^
 -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=OFF ^
 -DOPENEXR_BUILD_TESTS:BOOL=ON ^
 -DOPENEXR_RUN_FUZZ_TESTS:BOOL=OFF ^
--DOPENEXR_BUILD_UTILS:BOOL=ON ^
+-DOPENEXR_BUILD_TOOLS:BOOL=ON ^
 -DCMAKE_CXX_FLAGS_RELEASE="/MD" ^
 -DCMAKE_CXX_FLAGS_DEBUG="/MDd" ^
 -DCMAKE_C_FLAGS_RELEASE="/MD" ^
@@ -83,7 +83,7 @@ cmake -G %cmake_platform% ^
 -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=OFF ^
 -DOPENEXR_BUILD_TESTS:BOOL=ON ^
 -DOPENEXR_RUN_FUZZ_TESTS:BOOL=OFF ^
--DOPENEXR_BUILD_UTILS:BOOL=ON ^
+-DOPENEXR_BUILD_TOOLS:BOOL=ON ^
 -DCMAKE_CXX_FLAGS_RELEASE="/MD" ^
 -DCMAKE_CXX_FLAGS_DEBUG="/MDd" ^
 -DCMAKE_C_FLAGS_RELEASE="/MD" ^

diff --git a/Contrib/NuGet/OpenEXR-msvc-x86-build.nuget.bat b/Contrib/NuGet/OpenEXR-msvc-x86-build.nuget.bat
@@ -61,7 +61,7 @@ cmake -G %cmake_platform% ^
 -DOPENEXR_BUILD_PYTHON_LIBS:BOOL=OFF ^
 -DOPENEXR_BUILD_TESTS:BOOL=ON ^
 -DOPENEXR_RUN_FUZZ_TESTS:BOOL=OFF ^
--DOPENEXR_BUILD_UTILS:BOOL=ON ^
+-DOPENEXR_BUILD_TOOLS:BOOL=ON ^
 -DCMAKE_CXX_FLAGS_RELEASE="/MD" ^
 -DCMAKE_CXX_FLAGS_DEBUG="/MDd" ^
 -DCMAKE_C_FLAGS_RELEASE="/MD" ^
@@ -88,7 +88,7 @@ cmake -G %cmake_platform% ^
 -DOPENEXR_BUILD_VIEWERS:BOOL=ON ^
 -DOPENEXR_BUILD_TESTS:BOOL=ON ^
 -DOPENEXR_RUN_FUZZ_TESTS:BOOL=OFF ^
--DOPENEXR_BUILD_UTILS:BOOL=ON ^
+-DOPENEXR_BUILD_TOOLS:BOOL=ON ^
 -DCMAKE_CXX_FLAGS_RELEASE="/MD" ^
 -DCMAKE_CXX_FLAGS_DEBUG="/MDd" ^
 -DCMAKE_C_FLAGS_RELEASE="/MD" ^

diff --git a/cmake/OpenEXRSetup.cmake b/cmake/OpenEXRSetup.cmake
@@ -56,7 +56,7 @@ option(OPENEXR_ENABLE_LARGE_STACK "Enables code to take advantage of large stack
 ## Build related options
 
 # Whether to build & install the various command line utility programs
-option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON)
+option(OPENEXR_BUILD_TOOLS "Enables building of utility programs" ON)
 
 # This is a variable here for use in controlling where include files are 
 # installed. Care must be taken when changing this, as many things

diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
@@ -4,7 +4,7 @@
 ##########################
 # Binaries / Utilities
 ##########################
-if(OPENEXR_BUILD_UTILS)
+if(OPENEXR_BUILD_TOOLS)
   add_subdirectory( exr2aces )
   add_subdirectory( exrheader )
   add_subdirectory( exrmaketiled )