Merge branch 'master' into staticmacro

Hurleyworks · Sep 1, 2020 · ed32dcd · ed32dcd
2 parents 38d276e + e62aad7
commit ed32dcd
Show file tree

Hide file tree

Showing 31 changed files with 104 additions and 342 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,6 +65,8 @@ jobs:
       image: aswf/ci-openvdb:2018
     steps:
     - uses: actions/checkout@v1
+    - name: install_cmake
+      run: ./ci/install_cmake.sh 3.12.0
     - name: build
       run: ./ci/build.sh clang++ Release 5 ON None -DOPENVDB_CXX_STRICT=ON
     - name: test
@@ -111,6 +113,8 @@ jobs:
       run: test -f "hou/hou.tar.gz"
     - name: houdini
       run: ./ci/install_houdini.sh
+    - name: install_cmake
+      run: ./ci/install_cmake.sh 3.12.0
     - name: build
       run: ./ci/build_houdini.sh clang++ Release ON
     - name: test

diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml
@@ -41,6 +41,8 @@ jobs:
       run: ./ci/download_houdini.sh 17.5 ON ON ${{ secrets.HOUDINI_CLIENT_ID }} ${{ secrets.HOUDINI_SECRET_KEY }}
     - name: install_houdini
       run: ./ci/install_houdini.sh
+    - name: install_cmake
+      run: ./ci/install_cmake.sh 3.12.0
     - name: build
       run: ./ci/build_houdini.sh clang++ Release ON
     - name: test

diff --git a/CHANGES b/CHANGES
@@ -16,6 +16,7 @@ Version 7.1.1 - In Development
     - Re-organised the repository layout such that each independent library
       is able to be configured against an existing installation of OpenVDB
       without ambiguous include paths.
+    - Upgraded CMake minimum version support to 3.12.
     - Removed OPENVDB_STATIC_SPECIALIZATION macro which is no longer required.
 
 Version 7.1.0 - August 13, 2020

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@
 
 # note: cmake_minimum_required must be called before project commands to
 #  ensure policy scope is set up correctly
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 # CMP0091 allows for MSVC ABI targetting via CMAKE_MSVC_RUNTIME_LIBRARY
 # from CMake 3.15 and above. Must come before project().
@@ -152,53 +152,22 @@ set(OPENVDB_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/openvdb")
 
 ###### Deprecated options
 
-option(OPENVDB_BUILD_HOUDINI_SOPS "Build the Houdini plugin  (deprecated - see OPENVDB_BUILD_HOUDINI_PLUGIN)" OFF)
-option(OPENVDB_ENABLE_3_ABI_COMPATIBLE "Build with OpenVDB ABI 3 (deprecated - see OPENVDB_ABI_VERSION_NUMBER)" OFF)
-
-# Alias deprecated vars
-
 if(OPENVDB_BUILD_HOUDINI_SOPS)
-  # Support for legacy OPENVDB_BUILD_HOUDINI_SOPS variable
-  message(DEPRECATION "The OPENVDB_BUILD_HOUDINI_SOPS option is deprecated and will be removed. "
-    "Use OPENVDB_BUILD_HOUDINI_PLUGIN.")
-  set(OPENVDB_BUILD_HOUDINI_PLUGIN ON)
+  message(FATAL_ERROR "The OPENVDB_BUILD_HOUDINI_SOPS option has been removed. Use OPENVDB_BUILD_HOUDINI_PLUGIN.")
 endif()
-
-if(OPENVDB_ENABLE_3_ABI_COMPATIBLE)
-  message(DEPRECATION "OPENVDB_ENABLE_3_ABI_COMPATIBLE is deprecated and will be removed. Use "
-    "-D OPENVDB_ABI_VERSION_NUMBER=N, where N is the abi version.")
-  if(OPENVDB_ABI_VERSION_NUMBER)
-    if(NOT (${OPENVDB_ABI_VERSION_NUMBER} EQUAL 3))
-      message(WARNING "OPENVDB_ABI_VERSION_NUMBER holds a different ABI value to "
-        "OPENVDB_ENABLE_3_ABI_COMPATIBLE, which will be ignored.")
-    endif()
-  else()
-    # Don't bother setting the docstring as we'll update it later
-    set(OPENVDB_ABI_VERSION_NUMBER "3" CACHE STRING "" FORCE)
-  endif()
-endif()
-
 if(DEFINED USE_SYSTEM_LIBRARY_PATHS)
-  message(DEPRECATION "The USE_SYSTEM_LIBRARY_PATHS option is deprecated and will be removed. "
-    "Use DISABLE_CMAKE_SEARCH_PATHS.")
-  if(USE_SYSTEM_LIBRARY_PATHS)
-    set(DISABLE_CMAKE_SEARCH_PATHS OFF)
-  else()
-    set(DISABLE_CMAKE_SEARCH_PATHS ON)
-  endif()
+  message(FATAL_ERROR "The USE_SYSTEM_LIBRARY_PATHS option has been removed. Use DISABLE_CMAKE_SEARCH_PATHS.")
 endif()
 
 # Various root level CMake options which are marked as advanced
 
 mark_as_advanced(
   OPENVDB_CXX_STRICT
-  OPENVDB_ENABLE_3_ABI_COMPATIBLE
   OPENVDB_ENABLE_RPATH
   USE_HOUDINI
   USE_MAYA
   USE_LOG4CPLUS
   USE_CCACHE
-  OPENVDB_BUILD_HOUDINI_SOPS
   OPENVDB_BUILD_HOUDINI_ABITESTS
   DISABLE_DEPENDENCY_VERSION_CHECKS
   DISABLE_CMAKE_SEARCH_PATHS
@@ -252,7 +221,9 @@ endif()
 
 # VFX 19 deprecations to transition to MINIMUM_* variables in OpenVDB 8.0.0
 
-set(FUTURE_MINIMUM_CMAKE_VERSION 3.12)
+# Note: CMake 3.15 chosen as possible next version due to Windows support
+# with CMAKE_MSVC_RUNTIME_LIBRARY and numpy modules with CMake 3.14
+set(FUTURE_MINIMUM_CMAKE_VERSION 3.15)
 
 # No compiler upgrades planned
 #set(FUTURE_MINIMUM_GCC_VERSION 6.3.1)
@@ -341,7 +312,6 @@ enable_testing()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
 # Add backports to support older versions of CMake
-#  FindOpenGL.cmake is needed if CMake < 3.8
 #  FindNumPy.cmake is needed if CMake < 3.14
 
 if(${CMAKE_VERSION} VERSION_LESS 3.14)

diff --git a/ci/install_cmake.sh b/ci/install_cmake.sh
diff --git a/ci/test_install.sh b/ci/test_install.sh
@@ -8,7 +8,7 @@ set -e
 # the expected VDB installation
 
 cmakelists="
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 project(TestInstall LANGUAGES CXX)
 find_package(OpenVDB REQUIRED COMPONENTS openvdb)
 add_executable(test_vdb_print \"../openvdb/openvdb/cmd/openvdb_print.cc\")

diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
@@ -71,7 +71,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindCppUnit.cmake b/cmake/FindCppUnit.cmake
@@ -70,7 +70,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
@@ -80,7 +80,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindJemalloc.cmake b/cmake/FindJemalloc.cmake
@@ -64,7 +64,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake
@@ -70,7 +70,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
@@ -76,7 +76,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
@@ -99,7 +99,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
@@ -76,7 +76,7 @@ may be provided to tell this module where to look.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 include(GNUInstallDirs)
 
 # Monitoring <PackageName>_ROOT variables

diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake
@@ -47,7 +47,7 @@ The following variables may be provided to tell this module where to look.
 # Find the glfw3 installation and use glfw's CMake to initialize
 # the glfw lib
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 set(_FIND_GLFW3_ADDITIONAL_OPTIONS "")
 if(DISABLE_CMAKE_SEARCH_PATHS)

diff --git a/cmake/OpenVDBHoudiniSetup.cmake b/cmake/OpenVDBHoudiniSetup.cmake
@@ -75,7 +75,7 @@ may be provided to tell this module where to look.
 # Find the Houdini installation and use Houdini's CMake to initialize
 # the Houdini lib
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 # Monitoring <PackageName>_ROOT variables
 if(POLICY CMP0074)

diff --git a/cmake/OpenVDBMayaSetup.cmake b/cmake/OpenVDBMayaSetup.cmake
@@ -51,7 +51,7 @@ variables may be provided to tell this module where to look.
 # Find the Maya installation and use Maya's CMake to initialize
 # the Maya lib
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 # Monitoring <PackageName>_ROOT variables
 if(POLICY CMP0074)

diff --git a/cmake/OpenVDBUtils.cmake b/cmake/OpenVDBUtils.cmake
@@ -46,7 +46,7 @@ The following functions are provided:
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 
 function(OPENVDB_VERSION_FROM_HEADER OPENVDB_VERSION_FILE)

diff --git a/cmake/Uninstall.cmake b/cmake/Uninstall.cmake
@@ -16,7 +16,7 @@ existing from a previous run of cmake.
 
 #]=======================================================================]
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.12)
 
 set(MANIFEST "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")