Allow find_package CONFIG mode with Package_ROOT

Signed-off-by: Rémi Achard <[email protected]>

Author: remia

share/cmake/modules/FindImath.cmake

@@ -40,10 +40,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_Imath_REQUIRED_VARS Imath_LIBRARY)
     set(_Imath_LIB_VER "${Imath_FIND_VERSION_MAJOR}_${Imath_FIND_VERSION_MINOR}")
 
-    if(NOT DEFINED Imath_ROOT)
-        # Search for ImathConfig.cmake
-        find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for ImathConfig.cmake
+    find_package(Imath ${Imath_FIND_VERSION} CONFIG QUIET)
 
     if(Imath_FOUND)
         get_target_property(Imath_LIBRARY Imath::Imath LOCATION)

share/cmake/modules/FindOSL.cmake

@@ -29,22 +29,22 @@
 ###############################################################################
 ### Try to find package ###
 
-if(NOT DEFINED OSL_ROOT)
-    find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
-
-    set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
-    # Variable used by the OSL unit tests. 
-    set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
-
-    include (FindPackageHandleStandardArgs)
-    find_package_handle_standard_args (OSL
-        REQUIRED_VARS 
-            OSL_INCLUDE_DIR 
-            OSL_LIB_DIR 
-        VERSION_VAR   
-            OSL_VERSION
-    )
-else()
+find_package(OSL ${OSL_FIND_VERSION} CONFIG QUIET)
+
+set(OSL_SHADERS_INCLUDE_DIR ${OSL_INCLUDE_DIR}/../share)
+# Variable used by the OSL unit tests. 
+set(OSL_SHADERS_DIR ${OSL_SHADERS_INCLUDE_DIR}/OSL/shaders)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (OSL
+    REQUIRED_VARS 
+        OSL_INCLUDE_DIR 
+        OSL_LIB_DIR 
+    VERSION_VAR   
+        OSL_VERSION
+)
+
+if(NOT OSL_FOUND)
     set(OSL_INCLUDE_DIR ${OSL_ROOT}/include)
     set(OSL_VERSION_HEADER "${OSL_INCLUDE_DIR}/OSL/oslversion.h")
 

share/cmake/modules/Findexpat.cmake

@@ -39,10 +39,8 @@ endif()
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_expat_REQUIRED_VARS expat_LIBRARY)
 
-    if(NOT DEFINED expat_ROOT)
-        # Search for expat-config.cmake
-        find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for expat-config.cmake
+    find_package(expat ${expat_FIND_VERSION} CONFIG QUIET)
 
     if(expat_FOUND)
         if (TARGET expat::libexpat)

share/cmake/modules/Findminizip-ng.cmake

@@ -45,10 +45,8 @@ if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
 endif()
 
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
-    if(NOT DEFINED minizip-ng_ROOT)
-        # Search for minizip-ng-config.cmake
-        find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for minizip-ng-config.cmake
+    find_package(minizip-ng ${minizip-ng_FIND_VERSION} CONFIG QUIET)
 
     if (minizip-ng_FOUND)
         get_target_property(minizip-ng_INCLUDE_DIR MINIZIP::minizip-ng INTERFACE_INCLUDE_DIRECTORIES)

share/cmake/modules/Findpybind11.cmake

@@ -24,10 +24,8 @@
 ### Try to find package ###
 
 if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
-    if(NOT DEFINED pybind11_ROOT)
-        # Search for pybind11Config.cmake
-        find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
-    endif()
+    # Search for pybind11Config.cmake
+    find_package(pybind11 ${pybind11_FIND_VERSION} CONFIG QUIET)
 
     if(NOT pybind11_FOUND)
         # Find include directory

share/cmake/modules/Findyaml-cpp.cmake

@@ -44,9 +44,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
     set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY)
 
     # Search for yaml-cpp-config.cmake
-    if(NOT DEFINED yaml-cpp_ROOT)
-        find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
-    endif()
+    find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
 
     if(yaml-cpp_FOUND)
         # Alias target for yaml-cpp < 0.8 compatibility