Enable CMAKE_FIND_PACKAGE_PREFER_CONFIG in all the cmake builds.

BRL-CAD · Oct 11, 2024 · 2b1c757 · 2b1c757
1 parent b005cc7
commit 2b1c757
Show file tree

Hide file tree

Showing 64 changed files with 64 additions and 0 deletions.
diff --git a/appleseed/CMakeLists.txt b/appleseed/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_APPLESEED)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/appleseed.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/astyle/CMakeLists.txt b/astyle/CMakeLists.txt
@@ -28,6 +28,7 @@ if (ENABLE_ASTYLE)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/astyle.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/boost/CMakeLists.txt b/boost/CMakeLists.txt
@@ -18,6 +18,7 @@ if (ENABLE_BOOST)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/boost_cmake.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>

diff --git a/clipper2/CMakeLists.txt b/clipper2/CMakeLists.txt
@@ -17,6 +17,7 @@ if (ENABLE_CLIPPER2)
     #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/clipper2.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DCLIPPER2_UTILS=OFF
     -DCLIPPER2_EXAMPLES=OFF
     -DCLIPPER2_TESTS=OFF

diff --git a/deflate/CMakeLists.txt b/deflate/CMakeLists.txt
@@ -12,6 +12,7 @@ if (ENABLE_DEFLATE)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DDEFLATE_BUILD_CLI=OFF
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/eigen/CMakeLists.txt b/eigen/CMakeLists.txt
@@ -33,6 +33,7 @@ if (ENABLE_EIGEN)
     -DEIGEN_BUILD_DOC=OFF
     -DEIGEN_BUILD_PKGCONFIG=OFF
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/embree/CMakeLists.txt b/embree/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_EMBREE)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/embree.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DTBB_ROOT=$<$<BOOL:${TBB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
@@ -14,6 +14,7 @@ if (ENABLE_EXPAT)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/expat.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DEXPAT_SHARED_LIBS=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/flexbison/CMakeLists.txt b/flexbison/CMakeLists.txt
@@ -23,6 +23,7 @@ if (WIN32 AND ENABLE_FLEX)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/winflexbison.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/fmt/CMakeLists.txt b/fmt/CMakeLists.txt
@@ -11,6 +11,7 @@ if (ENABLE_FMT)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/fmt"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DFMT_DOC=OFF
     -DFMT_TEST=OFF
     ${BUILD_TYPE_SPECIFIER}

diff --git a/gdal/CMakeLists.txt b/gdal/CMakeLists.txt
@@ -19,6 +19,7 @@ if (ENABLE_GDAL)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gdal.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/geogram/CMakeLists.txt b/geogram/CMakeLists.txt
@@ -18,6 +18,7 @@ if (ENABLE_GEOGRAM)
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram_win32.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt
@@ -17,6 +17,7 @@ if (ENABLE_GLM)
     #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/glm.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/gte/CMakeLists.txt b/gte/CMakeLists.txt
@@ -30,6 +30,7 @@ if (ENABLE_GTE)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gte.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DCMAKE_INSTALL_PREFIX=${CMAKE_NOBUNDLE_INSTALL_PREFIX}
     LOG_CONFIGURE ${EXT_BUILD_QUIET}
     LOG_BUILD ${EXT_BUILD_QUIET}

diff --git a/ispc/CMakeLists.txt b/ispc/CMakeLists.txt
@@ -25,6 +25,7 @@ if (ENABLE_ISPC)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DFLEX_ROOT=$<$<BOOL:${FLEX_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>

diff --git a/itcl/CMakeLists.txt b/itcl/CMakeLists.txt
@@ -90,6 +90,7 @@ if (ENABLE_ITCL)
     COMMAND ${TCL_HDRS_PATCH_CMD}
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
     -DLIB_DIR=${LIB_DIR}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

diff --git a/itk/CMakeLists.txt b/itk/CMakeLists.txt
@@ -59,6 +59,7 @@ if (ENABLE_ITK)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/itk.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
     -DLIB_DIR=${LIB_DIR}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

diff --git a/iwidgets/CMakeLists.txt b/iwidgets/CMakeLists.txt
@@ -30,6 +30,7 @@ if (ENABLE_IWIDGETS)
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}

diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
@@ -17,6 +17,7 @@ if (ENABLE_JPEG)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
@@ -17,6 +17,7 @@ if (ENABLE_LEMON)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lemon_cmake.patch
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lemon_brlcad.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/lief/CMakeLists.txt b/lief/CMakeLists.txt
@@ -18,6 +18,7 @@ if (NOT MSVC AND NOT APPLE)
       BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
       PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lief.patch
       CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
       ${BUILD_TYPE_SPECIFIER}
       -DBIN_DIR=${BIN_DIR}
       -DLIB_DIR=${LIB_DIR}

diff --git a/linenoise/CMakeLists.txt b/linenoise/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_LINENOISE)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/linenoise.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
@@ -38,6 +38,7 @@ if (ENABLE_LLVM)
       ${Z_BRL_PATCH_CMD}
       CMAKE_ARGS
       -C ${CMAKE_CURRENT_SOURCE_DIR}/llvm_targets.cmake
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
       ${BUILD_TYPE_SPECIFIER}
       $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
       $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/lmdb/CMakeLists.txt b/lmdb/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_LMDB)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lmdb.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/lz4/CMakeLists.txt b/lz4/CMakeLists.txt
@@ -12,6 +12,7 @@ if (ENABLE_LZ4)
     SOURCE_SUBDIR build/cmake
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DLZ4_BUILD_CLI=OFF
     -DBIN_DIR=${BIN_DIR}

diff --git a/manifold/CMakeLists.txt b/manifold/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_MANIFOLD)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/manifold"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/minizip-ng/CMakeLists.txt b/minizip-ng/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_MINIZIP_NG)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/minizip-ng.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/mmesh/CMakeLists.txt b/mmesh/CMakeLists.txt
@@ -17,6 +17,7 @@ if (ENABLE_MMESH)
     CMAKE_ARGS
     -DMMESH_BUILD_EXAMPLES=OFF
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}

diff --git a/netpbm/CMakeLists.txt b/netpbm/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_NETPBM)
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/onetbb/CMakeLists.txt b/onetbb/CMakeLists.txt
@@ -25,6 +25,7 @@ if (ENABLE_ONETBB)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/oneTBB"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DTBB_TEST=OFF
     -DBIN_DIR=${BIN_DIR}

diff --git a/opencolorio/CMakeLists.txt b/opencolorio/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_OPENCOLORIO)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencolorio.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
@@ -20,6 +20,7 @@ if (ENABLE_OPENCV)
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencv.patch
     CMAKE_ARGS
     -DMIN_VER_CMAKE=3.19
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/openexr/CMakeLists.txt b/openexr/CMakeLists.txt
@@ -11,6 +11,7 @@ if (ENABLE_OPENEXR)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/openexr"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DOPENEXR_BUILD_CLI=OFF
     -DBIN_DIR=${BIN_DIR}

diff --git a/openimageio/CMakeLists.txt b/openimageio/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_OPENIMAGEIO)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/oiio.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/openmesh/CMakeLists.txt b/openmesh/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_OPENMESH)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/openmesh.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/opennurbs/CMakeLists.txt b/opennurbs/CMakeLists.txt
@@ -44,6 +44,7 @@ if (ENABLE_OPENNURBS)
     COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_3dm_attributes.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>

diff --git a/osl/CMakeLists.txt b/osl/CMakeLists.txt
@@ -20,6 +20,7 @@ if (ENABLE_OSL)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/osl.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/osmesa/CMakeLists.txt b/osmesa/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_OSMESA)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/osmesa"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     -DOSMESA_BUILD_EXAMPLES=OFF
     ${BUILD_TYPE_SPECIFIER}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

diff --git a/ospray/CMakeLists.txt b/ospray/CMakeLists.txt
@@ -12,6 +12,7 @@ if (ENABLE_OSPRAY)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/ospray.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DEMBREE_ROOT=$<$<BOOL:${EMBREE_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
     -DISPC_ROOT=$<$<BOOL:${ISPC_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>

diff --git a/patch/CMakeLists.txt b/patch/CMakeLists.txt
@@ -36,6 +36,7 @@ if (ENABLE_PATCH)
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patch"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/patchelf/CMakeLists.txt b/patchelf/CMakeLists.txt
@@ -29,6 +29,7 @@ if (NOT MSVC AND NOT APPLE)
       SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patchelf"
       BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
       CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
       $<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
       -DBIN_DIR=${BIN_DIR}
       -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/perplex/CMakeLists.txt b/perplex/CMakeLists.txt
@@ -15,6 +15,7 @@ if (ENABLE_PERPLEX)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/perplex"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DLEMON_ROOT=$<$<BOOL:${LEMON_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
     -DRE2C_ROOT=$<$<BOOL:${RE2C_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>

diff --git a/plief/CMakeLists.txt b/plief/CMakeLists.txt
@@ -31,6 +31,7 @@ if (NOT MSVC AND NOT APPLE)
       URL "${CMAKE_CURRENT_SOURCE_DIR}/plief"
       BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
       CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
       ${BUILD_TYPE_SPECIFIER}
       -DLIEF_ROOT=$<$<BOOL:${LEMON_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
       -DBIN_DIR=${BIN_DIR}

diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt
@@ -32,6 +32,7 @@ if (ENABLE_PNG)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/png.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/poissonrecon/CMakeLists.txt b/poissonrecon/CMakeLists.txt
@@ -29,6 +29,7 @@ if (ENABLE_POISSONRECON)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/poissonrecon.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DCMAKE_INSTALL_PREFIX=${CMAKE_NOBUNDLE_INSTALL_PREFIX}
     LOG_CONFIGURE ${EXT_BUILD_QUIET}

diff --git a/proj/CMakeLists.txt b/proj/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_PROJ)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/proj.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/pugixml/CMakeLists.txt b/pugixml/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_PUGIXML)
     URL "${CMAKE_CURRENT_SOURCE_DIR}/pugixml"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/pystring/CMakeLists.txt b/pystring/CMakeLists.txt
@@ -12,6 +12,7 @@ if (ENABLE_PYSTRING)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/pystring.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}

diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
@@ -55,6 +55,7 @@ if (ENABLE_QT)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/qtsvg.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>

diff --git a/re2c/CMakeLists.txt b/re2c/CMakeLists.txt
@@ -16,6 +16,7 @@ if (ENABLE_RE2C)
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
     PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/re2c.patch
     CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
     ${BUILD_TYPE_SPECIFIER}
     -DRE2C_BUILD_RE2GO=OFF
     -DRE2C_BUILD_RE2RUST=OFF