build(deps): Raise minimum CMake dependency from 3.12 to 3.15

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
             simd: sse4.2
             fmt_ver: 6.1.2
             pybind11_ver: v2.4.2
-            setenvs: export PUGIXML_VERSION=v1.9
+            setenvs: export PUGIXML_VERSION=v1.9 CMAKE_VERSION=3.15.5
           - desc: gcc6/C++14 py3.7 boost1.70 exr2.4 ocio1.1
             nametag: linux-vfx2020
             os: ubuntu-latest
@@ -162,11 +162,12 @@ jobs:
             python_ver: 2.7
             simd: 0
             setenvs: export  EMBEDPLUGINS=0
+                             CMAKE_VERSION=3.15.5
                              PTEX_VERSION=v2.3.1
+                             WEBP_VERSION=v1.0.0
                              USE_JPEGTURBO=0
                              USE_OPENCOLORIO=0
                              USE_OPENCV=0
-                             WEBP_VERSION=v1.0.0
             depcmds: sudo rm -rf /usr/local/include/OpenEXR
 
           # Test formatting. This test entry doesn't do a full build, it

CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
 # https://github.com/OpenImageIO/oiio
 
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.15)
 
 set (OpenImageIO_VERSION "2.5.2.0")
 set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING

INSTALL.md

@@ -19,7 +19,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
        CMake configuration flag: `-DCMAKE_CXX_STANDARD=17`, etc.
  * Compilers: gcc 6.1 - 12.1, clang 3.4 - 16, MSVS 2017 - 2019,
    Intel icc 17+, Intel OneAPI C++ compiler 2022+.
- * CMake >= 3.12 (tested through 3.26)
+ * **CMake >= 3.15** (tested through 3.27)
  * OpenEXR/Imath >= 2.3 (recommended: 2.4 or higher; tested through 3.1 and main)
  * libTIFF >= 3.9 (recommended: 4.0+; tested through 4.5)
  * libjpeg >= 8, or libjpeg-turbo >= 1.1 (tested through jpeg9d and jpeg-turbo
@@ -251,9 +251,8 @@ The command 'make help' will list all possible options.
 You can also ignore the top level Makefile wrapper, and instead use
 CMake directly:
 
-    mkdir build
-    cd build
-    cmake ..
+    cmake -B build -S .
+    cmake --build build --target install
 
 If the compile stops because of warnings, try again with
 
@@ -262,8 +261,9 @@ If the compile stops because of warnings, try again with
 
 or, if you are using CMake directly,
 
-    cd build
-    cmake -DSTOP_ON_WARNING=0 ..
+    rm -rf build
+    cmake -B build -S . -DSTOP_ON_WARNING=0
+    cmake --build build --target install
 
 
 
@@ -288,56 +288,51 @@ the section below, and will only have to point OIIO build process so their locat
   ```
   cd {ZLIB_ROOT}
   git clone https://github.com/madler/zlib .
-  mkdir build
-  cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=. ..
-  cmake --build . --config Release --target install
-  del lib\zlib.lib
+  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.
+  cmake --build build --config Release --target install
+  del build\lib\zlib.lib
   ```
 * libTIFF:
   ```
   cd {TIFF_ROOT}
   git clone https://gitlab.com/libtiff/libtiff.git .
-  cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=. ..
-  cmake --build . --target install
+  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=.
+  cmake --build build --target install
   ```
 * libjpeg-turbo:
   ```
   cd {JPEG_ROOT}
   git clone https://github.com/libjpeg-turbo/libjpeg-turbo .
   mkdir build
   cd build
-  cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=. ..
-  cmake --build . --config Release --target install
+  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=.
+  cmake --build build --config Release --target install
   ```
 * OpenEXR: you'll have to point it to your `{ZLIB_ROOT}` location from the above. If copy-pasting the multi-line command (with lines ending in `^`) into
   cmd.exe prompt, make sure to copy all the lines at once.
   ```
   cd {EXR_ROOT}
   git clone https://github.com/AcademySoftwareFoundation/openexr .
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=dist ^
+  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=dist ^
     -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DOPENEXR_BUILD_TOOLS=OFF ^
     -DOPENEXR_INSTALL_TOOLS=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF ^
-    -DZLIB_ROOT={ZLIB_ROOT}\build ..
-  cmake --build . --target install --config Release
+    -DZLIB_ROOT={ZLIB_ROOT}\build
+  cmake --build build --target install --config Release
   ```
 
 Now get the OIIO source and do one-time CMake configuration step. Replace `{*_ROOT}` below with folders where you have put the 3rd party
 dependencies.
 ```
 cd {OIIO_ROOT}
 git clone https://github.com/OpenImageIO/oiio .
-mkdir build
-cd build
-cmake -DVERBOSE=ON -DCMAKE_BUILD_TYPE=Release ^
+cmake -S . -B build -DVERBOSE=ON -DCMAKE_BUILD_TYPE=Release ^
   -DBoost_USE_STATIC_LIBS=ON -DBoost_NO_WARN_NEW_VERSIONS=ON -DBoost_ROOT={BOOST_ROOT} ^
   -DZLIB_ROOT={ZLIB_ROOT}\build ^
   -DTIFF_ROOT={TIFF_ROOT}\build ^
   -DOpenEXR_ROOT={EXR_ROOT}\build\dist ^
   -DImath_DIR={EXR_ROOT}\build\dist\lib\cmake\Imath ^
   -DJPEG_ROOT={JPEG_ROOT}\build ^
-  -DUSE_PYTHON=0 -DUSE_QT=0 -DBUILD_SHARED_LIBS=0 -DLINKSTATIC=1 ..
+  -DUSE_PYTHON=0 -DUSE_QT=0 -DBUILD_SHARED_LIBS=0 -DLINKSTATIC=1
 ```
 
 This will produce `{OIIO_ROOT}/build/OpenImageIO.sln` that can be opened in Visual Studio IDE. Note that the solution will be

Makefile

@@ -299,7 +299,7 @@ clang-format: config
 # DEPRECATED: 'make dist' is just a synonym for 'make install'
 dist : install
 
-TEST_FLAGS += --force-new-ctest-process --output-on-failure
+TEST_FLAGS += --force-new-ctest-process --output-on-failure --progress
 
 # 'make test' does a full build and then runs all tests
 test: build

src/build-scripts/build_OpenJPEG.bash

@@ -36,15 +36,13 @@ cd ${OPENJPEG_SRC_DIR}
 echo "git checkout ${OPENJPEG_VERSION} --force"
 git checkout ${OPENJPEG_VERSION} --force
 
-mkdir -p ${OPENJPEG_BUILD_DIR} && true
-cd ${OPENJPEG_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S . -B ${OPENJPEG_BUILD_DIR} \
+               -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=${OPENJPEG_INSTALL_DIR} \
                -DBUILD_CODEC=OFF \
-               ${OPENJPEG_CONFIG_OPTS} ..
-    time cmake --build . --config Release --target install
+               ${OPENJPEG_CONFIG_OPTS}
+    time cmake --build ${OPENJPEG_BUILD_DIR} --config Release --target install
 fi
 
 # ls -R ${OPENJPEG_INSTALL_DIR}

src/build-scripts/build_Ptex.bash

@@ -31,12 +31,10 @@ cd ${PTEX_SRC_DIR}
 echo "git checkout ${PTEX_VERSION} --force"
 git checkout ${PTEX_VERSION} --force
 
-mkdir -p ${PTEX_BUILD_DIR}
-cd ${PTEX_BUILD_DIR}
-time cmake -DCMAKE_BUILD_TYPE=Release \
+time cmake -S . -B ${PTEX_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_INSTALL_PREFIX=${PTEX_INSTALL_DIR} \
-           ${PTEX_CONFIG_OPTS} ..
-time cmake --build . --config Release --target install
+           ${PTEX_CONFIG_OPTS}
+time cmake --build ${PTEX_BUILD_DIR} --config Release --target install
 
 # ls -R ${PTEX_INSTALL_DIR}
 popd

src/build-scripts/build_cmake.bash

@@ -12,7 +12,7 @@ set -ex
 echo "Building cmake"
 uname
 
-CMAKE_VERSION=${CMAKE_VERSION:=3.12.4}
+CMAKE_VERSION=${CMAKE_VERSION:=3.18.5}
 LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
 CMAKE_INSTALL_DIR=${CMAKE_INSTALL_DIR:=${LOCAL_DEPS_DIR}/cmake}
 

src/build-scripts/build_libjpeg-turbo.bash

@@ -36,14 +36,11 @@ cd ${LIBJPEGTURBO_SRC_DIR}
 echo "git checkout ${LIBJPEGTURBO_VERSION} --force"
 git checkout ${LIBJPEGTURBO_VERSION} --force
 
-mkdir -p ${LIBJPEGTURBO_BUILD_DIR}
-cd ${LIBJPEGTURBO_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S . -B ${LIBJPEGTURBO_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=${LIBJPEGTURBO_INSTALL_DIR} \
-               ${LIBJPEGTURBO_CONFIG_OPTS} ..
-    time cmake --build . --config Release --target install
+               ${LIBJPEGTURBO_CONFIG_OPTS}
+    time cmake --build ${LIBJPEGTURBO_BUILD_DIR} --config Release --target install
 fi
 
 # ls -R ${LIBJPEGTURBO_INSTALL_DIR}

src/build-scripts/build_libpng.bash

@@ -38,16 +38,13 @@ cd ${LIBPNG_SRC_DIR}
 echo "git checkout ${LIBPNG_VERSION} --force"
 git checkout ${LIBPNG_VERSION} --force
 
-mkdir -p ${LIBPNG_BUILD_DIR}
-cd ${LIBPNG_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S . -B ${LIBPNG_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=${LIBPNG_INSTALL_DIR} \
                -DPNG_EXECUTABLES=OFF \
                -DPNG_TESTS=OFF \
-               ${LIBPNG_CONFIG_OPTS} ..
-    time cmake --build . --config Release --target install
+               ${LIBPNG_CONFIG_OPTS}
+    time cmake --build ${LIBPNG_BUILD_DIR} --config Release --target install
 fi
 
 # ls -R ${LIBPNG_INSTALL_DIR}

src/build-scripts/build_libtiff.bash

@@ -36,19 +36,17 @@ cd libtiff
 echo "git checkout ${LIBTIFF_VERSION} --force"
 git checkout ${LIBTIFF_VERSION} --force
 
-mkdir -p build
-cd build
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=${LIBTIFF_BUILD_TYPE} \
+    time cmake -S . -B build \
+               -DCMAKE_BUILD_TYPE=${LIBTIFF_BUILD_TYPE} \
                -DCMAKE_INSTALL_PREFIX=${LIBTIFF_INSTALL_DIR} \
                -DCMAKE_CXX_FLAGS="${LIBTIFF_CXX_FLAGS}" \
                -DBUILD_SHARED_LIBS=${LIBTIFF_BUILD_SHARED_LIBS:-ON} \
                -Dtiff-tests=${LIBTIFF_BUILD_TESTS:-OFF} \
                -Dtiff-docs=${LIBTIFF_BUILD_TESTS:-OFF} \
                -Dlibdeflate=ON \
-               ${LIBTIFF_BUILDOPTS} ..
-    time cmake --build . --target install
+               ${LIBTIFF_BUILDOPTS}
+    time cmake --build build --target install
 fi
 
 popd

src/build-scripts/build_opencolorio.bash

@@ -18,6 +18,7 @@ LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
 OPENCOLORIO_SOURCE_DIR=${OPENCOLORIO_SOURCE_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO}
 OPENCOLORIO_BUILD_DIR=${OPENCOLORIO_BUILD_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO-build}
 OPENCOLORIO_INSTALL_DIR=${OPENCOLORIO_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
+OPENCOLORIO_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE:=Release}
 OPENCOLORIO_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
 # Just need libs:
 OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
@@ -42,13 +43,12 @@ cd ${OPENCOLORIO_SOURCE_DIR}
 
 echo "git checkout ${OPENCOLORIO_VERSION} --force"
 git checkout ${OPENCOLORIO_VERSION} --force
-mkdir -p ${OPENCOLORIO_BUILD_DIR}
-cd ${OPENCOLORIO_BUILD_DIR}
-time cmake -DCMAKE_BUILD_TYPE=Release \
+time cmake -S . -B ${OPENCOLORIO_BUILD_DIR} \
+           -DCMAKE_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE} \
            -DCMAKE_INSTALL_PREFIX=${OPENCOLORIO_INSTALL_DIR} \
            -DCMAKE_CXX_FLAGS="${OPENCOLORIO_CXX_FLAGS}" \
-           ${OPENCOLORIO_BUILDOPTS} ${OPENCOLORIO_SOURCE_DIR}
-time cmake --build . --config Release --target install
+           ${OPENCOLORIO_BUILDOPTS}
+time cmake --build ${OPENCOLORIO_BUILD_DIR} --config Release --target install
 popd
 
 # ls -R ${OPENCOLORIO_INSTALL_DIR}

src/build-scripts/build_openexr.bash

@@ -36,28 +36,27 @@ if [[ ! -e ${OPENEXR_SOURCE_DIR} ]] ; then
     git clone ${OPENEXR_REPO} ${OPENEXR_SOURCE_DIR}
 fi
 mkdir -p ${OPENEXR_INSTALL_DIR} && true
-mkdir -p ${OPENEXR_BUILD_DIR} && true
 
 pushd ${OPENEXR_SOURCE_DIR}
 git checkout ${OPENEXR_VERSION} --force
 
 if [[ ${OPENEXR_VERSION} == "v2.3.0" ]] ; then
     # Simplified setup for 2.3+
-    cd ${OPENEXR_BUILD_DIR}
-    cmake -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
+    cmake   -S . -B ${OPENEXR_BUILD_DIR} \
+            -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
             -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
             -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
             -DILMBASE_PACKAGE_PREFIX="${OPENEXR_INSTALL_DIR}" \
             -DOPENEXR_BUILD_UTILS=0 \
             -DOPENEXR_BUILD_TESTS=0 \
             -DOPENEXR_BUILD_PYTHON_LIBS=0 \
             -DCMAKE_CXX_FLAGS="${OPENEXR_CXX_FLAGS}" \
-            ${OPENEXR_CMAKE_FLAGS} ${OPENEXR_SOURCE_DIR}
-    time cmake --build . --target install --config ${OPENEXR_BUILD_TYPE}
+            ${OPENEXR_CMAKE_FLAGS}
+    time cmake --build ${OPENEXR_BUILD_DIR} --target install --config ${OPENEXR_BUILD_TYPE}
 else
     # Simplified setup for 2.4+
-    cd ${OPENEXR_BUILD_DIR}
-    cmake -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
+    cmake   -S . -B ${OPENEXR_BUILD_DIR} \
+            -DCMAKE_BUILD_TYPE=${OPENEXR_BUILD_TYPE} \
             -DCMAKE_INSTALL_PREFIX="${OPENEXR_INSTALL_DIR}" \
             -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" \
             -DILMBASE_PACKAGE_PREFIX="${OPENEXR_INSTALL_DIR}" \
@@ -69,8 +68,8 @@ else
             -DOPENEXR_INSTALL_EXAMPLES=0 \
             -DCMAKE_INSTALL_LIBDIR=lib \
             -DCMAKE_CXX_FLAGS="${OPENEXR_CXX_FLAGS}" \
-            ${OPENEXR_CMAKE_FLAGS} ${OPENEXR_SOURCE_DIR}
-    time cmake --build . --target install --config ${OPENEXR_BUILD_TYPE}
+            ${OPENEXR_CMAKE_FLAGS}
+    time cmake --build ${OPENEXR_BUILD_DIR} --target install --config ${OPENEXR_BUILD_TYPE}
 fi
 
 popd

src/build-scripts/build_pugixml.bash

@@ -38,16 +38,13 @@ cd ${PUGIXML_SRC_DIR}
 echo "git checkout ${PUGIXML_VERSION} --force"
 git checkout ${PUGIXML_VERSION} --force
 
-mkdir -p ${PUGIXML_BUILD_DIR}
-cd ${PUGIXML_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S . -B ${PUGIXML_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=${PUGIXML_INSTALL_DIR} \
                -DBUILD_SHARED_LIBS=ON \
                -DBUILD_TESTS=OFF \
                ${PUGIXML_BUILD_OPTS} ..
-    time cmake --build . --config Release --target install
+    time cmake --build ${PUGIXML_BUILD_DIR} --config Release --target install
 fi
 
 # ls -R ${PUGIXML_INSTALL_DIR}

src/build-scripts/build_pybind11.bash

@@ -42,15 +42,12 @@ cd ${PYBIND11_SRC_DIR}
 echo "git checkout ${PYBIND11_VERSION} --force"
 git checkout ${PYBIND11_VERSION} --force
 
-mkdir -p ${PYBIND11_BUILD_DIR}
-cd ${PYBIND11_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=Release \
+    time cmake -S . -B ${PYBIND11_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=${PYBIND11_INSTALL_DIR} \
                -DPYBIND11_TEST=OFF \
-               ${PYBIND11_BUILD_OPTS} ..
-    time cmake --build . --config Release --target install
+               ${PYBIND11_BUILD_OPTS}
+    time cmake --build ${PYBIND11_BUILD_DIR} --config Release --target install
 fi
 
 # ls -R ${PYBIND11_INSTALL_DIR}

src/build-scripts/build_webp.bash

@@ -37,11 +37,8 @@ cd ${WEBP_SRC_DIR}
 echo "git checkout ${WEBP_VERSION} --force"
 git checkout ${WEBP_VERSION} --force
 
-mkdir -p ${WEBP_BUILD_DIR}
-cd ${WEBP_BUILD_DIR}
-
 if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
-    time cmake -DCMAKE_BUILD_TYPE=${WEBP_BUILD_TYPE} \
+    time cmake -S . -B ${WEBP_BUILD_DIR} -DCMAKE_BUILD_TYPE=${WEBP_BUILD_TYPE} \
                -DCMAKE_INSTALL_PREFIX=${WEBP_INSTALL_DIR} \
                -DWEBP_BUILD_ANIM_UTILS=OFF \
                -DWEBP_BUILD_CWEBP=OFF \
@@ -51,8 +48,8 @@ if [[ -z $DEP_DOWNLOAD_ONLY ]]; then
                -DWEBP_BUILD_IMG2WEBP=OFF \
                -DWEBP_BUILD_EXTRAS=OFF \
                -DBUILD_SHARED_LIBS=ON \
-               ${WEBP_CONFIG_OPTS} ..
-    time cmake --build . --target install
+               ${WEBP_CONFIG_OPTS}
+    time cmake --build ${WEBP_BUILD_DIR} --target install
 fi