diff --git a/appleseed/CMakeLists.txt b/appleseed/CMakeLists.txt index 88c0de65..a7343c13 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/astyle/CMakeLists.txt b/astyle/CMakeLists.txt index 7f378d22..d9442af5 100644 --- 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 index 8828a005..02b05379 100644 --- 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 $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> -DZLIB_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/clipper2/CMakeLists.txt b/clipper2/CMakeLists.txt index 0c43255d..d083c51e 100644 --- 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 index d3c36c1e..af22417c 100644 --- 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 index 606faab9..1de48994 100644 --- 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 index 211480d4..4a15a641 100644 --- 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 $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> -DTBB_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 90e96444..17b241dc 100644 --- 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 index 58ff6365..bcc26391 100644 --- 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 index a434f76e..89150a66 100644 --- 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 index 0a5a2b73..239459c1 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/geogram/CMakeLists.txt b/geogram/CMakeLists.txt index d2c61c11..90c91ba8 100644 --- 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 index 11c8e763..2058d7eb 100644 --- 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 index c464ab04..6db14dd6 100644 --- 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 index 6d6196a0..641a9c8f 100644 --- 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 $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> -DFLEX_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/itcl/CMakeLists.txt b/itcl/CMakeLists.txt index 3b187626..c9ec3017 100644 --- 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=$,${LIB_DIR},${BIN_DIR}> -DLIB_DIR=${LIB_DIR} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/itk/CMakeLists.txt b/itk/CMakeLists.txt index 0db56fb1..c80de02a 100644 --- 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=$,${LIB_DIR},${BIN_DIR}> -DLIB_DIR=${LIB_DIR} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} diff --git a/iwidgets/CMakeLists.txt b/iwidgets/CMakeLists.txt index 497b1f75..5c89a99d 100644 --- 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 index 055365ee..f647bc3c 100644 --- 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 index c1ca0a2e..db60d65a 100644 --- 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 index ce67aab9..368e776a 100644 --- 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 index b5061739..f953210b 100644 --- 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 index ff5edc43..cd3c818f 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/lmdb/CMakeLists.txt b/lmdb/CMakeLists.txt index 9bc94e8c..b5329b45 100644 --- 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 index 316eb9f3..c90f947b 100644 --- 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 index f20506c2..f41ffb26 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/minizip-ng/CMakeLists.txt b/minizip-ng/CMakeLists.txt index c0e6fad5..dbe597de 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/mmesh/CMakeLists.txt b/mmesh/CMakeLists.txt index 1a52f209..fda49f5e 100644 --- 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 index 7c9b2a90..39b1b47b 100644 --- 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 index b8ccaba7..a6ff6d5a 100644 --- 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 index e2c2cfea..d3938bd5 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt index 60098a86..b82d6ab8 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/openexr/CMakeLists.txt b/openexr/CMakeLists.txt index c0d98c76..5180f5d6 100644 --- 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 index a7ae08cc..9c36c9c8 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/openmesh/CMakeLists.txt b/openmesh/CMakeLists.txt index e498099e..c57f6c05 100644 --- 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 index 7d3c52c5..49cc6606 100644 --- 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 $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> -DZLIB_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/osl/CMakeLists.txt b/osl/CMakeLists.txt index da47a9cd..fb4ae8b4 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/osmesa/CMakeLists.txt b/osmesa/CMakeLists.txt index d18da444..d7b2d95a 100644 --- 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 index 4ca97201..e04a9b8a 100644 --- 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=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> -DISPC_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/patch/CMakeLists.txt b/patch/CMakeLists.txt index 9680f381..ff17746e 100644 --- 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 index 75b576f2..ce2e958c 100644 --- 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 $<$>:-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 index 6806d13d..53101c45 100644 --- 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=$<$:${CMAKE_NOBUNDLE_INSTALL_PREFIX}> -DRE2C_ROOT=$<$:${CMAKE_NOBUNDLE_INSTALL_PREFIX}> diff --git a/plief/CMakeLists.txt b/plief/CMakeLists.txt index ddf3ae72..859bb6d2 100644 --- 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=$<$:${CMAKE_NOBUNDLE_INSTALL_PREFIX}> -DBIN_DIR=${BIN_DIR} diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt index d0fc2d54..2a55e23f 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/poissonrecon/CMakeLists.txt b/poissonrecon/CMakeLists.txt index 648a9bf4..85652269 100644 --- 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 index d410a4c6..6dee0028 100644 --- 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 index a1d27aab..19af99aa 100644 --- 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 index 79e87bba..ecaab58b 100644 --- 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 index bd3e6c7d..1d7e172c 100644 --- 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} $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> diff --git a/re2c/CMakeLists.txt b/re2c/CMakeLists.txt index 31817de7..3bbbfd50 100644 --- 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 diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index 0e813594..6f913755 100644 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt @@ -20,6 +20,7 @@ if (ENABLE_REGEX) SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/regex" 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/rkcommon/CMakeLists.txt b/rkcommon/CMakeLists.txt index 1c069246..5b32af5a 100644 --- a/rkcommon/CMakeLists.txt +++ b/rkcommon/CMakeLists.txt @@ -12,6 +12,7 @@ if (ENABLE_RKCOMMON) BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/rkcommon.patch CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON ${BUILD_TYPE_SPECIFIER} -DTBB_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> -DBIN_DIR=${BIN_DIR} diff --git a/sqlite3/CMakeLists.txt b/sqlite3/CMakeLists.txt index 79e4ecb8..83b44252 100644 --- a/sqlite3/CMakeLists.txt +++ b/sqlite3/CMakeLists.txt @@ -27,6 +27,7 @@ if (ENABLE_SQLite3) PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.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/stepcode/CMakeLists.txt b/stepcode/CMakeLists.txt index 8cc6e86c..23ca2ce1 100644 --- a/stepcode/CMakeLists.txt +++ b/stepcode/CMakeLists.txt @@ -19,6 +19,7 @@ if (ENABLE_STEPCODE) 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=OFF diff --git a/strclear/CMakeLists.txt b/strclear/CMakeLists.txt index af4673a2..ab6b30ff 100644 --- a/strclear/CMakeLists.txt +++ b/strclear/CMakeLists.txt @@ -27,6 +27,7 @@ if (ENABLE_STRCLEAR) 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} -DDATA_DIR=${DATA_DIR} diff --git a/tiff/CMakeLists.txt b/tiff/CMakeLists.txt index 19a1da07..25e57fac 100644 --- a/tiff/CMakeLists.txt +++ b/tiff/CMakeLists.txt @@ -20,6 +20,7 @@ if (ENABLE_TIFF) BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/tiff.patch CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON $<$:-DZ_PREFIX=ON> $<$:-DZ_PREFIX_STR=${Z_PREFIX_STR}> -DZLIB_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> diff --git a/tkhtml/CMakeLists.txt b/tkhtml/CMakeLists.txt index 103adbdf..d85556cf 100644 --- a/tkhtml/CMakeLists.txt +++ b/tkhtml/CMakeLists.txt @@ -47,6 +47,7 @@ if (ENABLE_TKHTML) SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tkhtml" BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON ${BUILD_TYPE_SPECIFIER} -DBIN_DIR=$,${LIB_DIR},${BIN_DIR}> -DLIB_DIR=${LIB_DIR} diff --git a/tktable/CMakeLists.txt b/tktable/CMakeLists.txt index f4f0ebba..9b8b1b10 100644 --- a/tktable/CMakeLists.txt +++ b/tktable/CMakeLists.txt @@ -48,6 +48,7 @@ if (ENABLE_TKTABLE) SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tktable" BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON ${BUILD_TYPE_SPECIFIER} -DBIN_DIR=$,${LIB_DIR},${BIN_DIR}> -DLIB_DIR=${LIB_DIR} diff --git a/utahrle/CMakeLists.txt b/utahrle/CMakeLists.txt index 97445e00..809fc6df 100644 --- a/utahrle/CMakeLists.txt +++ b/utahrle/CMakeLists.txt @@ -15,6 +15,7 @@ if (ENABLE_UTAHRLE) SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/utahrle" 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/xerces-c/CMakeLists.txt b/xerces-c/CMakeLists.txt index 0b47082d..a6dcb28d 100644 --- a/xerces-c/CMakeLists.txt +++ b/xerces-c/CMakeLists.txt @@ -12,6 +12,7 @@ if (ENABLE_XERCES_C) BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/xerces-c.patch CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON ${BUILD_TYPE_SPECIFIER} -DICU_ROOT=$<$:${CMAKE_BUNDLE_INSTALL_PREFIX}> -Dnetwork=OFF diff --git a/xmltools/CMakeLists.txt b/xmltools/CMakeLists.txt index 90e739db..28f308c6 100644 --- a/xmltools/CMakeLists.txt +++ b/xmltools/CMakeLists.txt @@ -30,6 +30,7 @@ if (ENABLE_XMLTOOLS) SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/xmltools" 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/yaml-cpp/CMakeLists.txt b/yaml-cpp/CMakeLists.txt index 7d2a6197..ad6fe54c 100644 --- a/yaml-cpp/CMakeLists.txt +++ b/yaml-cpp/CMakeLists.txt @@ -12,6 +12,7 @@ if (ENABLE_YAML_CPP) 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/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index 1baf40b7..9b6f0303 100644 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -25,6 +25,7 @@ if (ENABLE_ZLIB) COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_rc.patch COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_prefix.patch CMAKE_ARGS + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON ${BUILD_TYPE_SPECIFIER} -DZ_PREFIX_STR=${Z_PREFIX_STR} -DZLIB_BUILD_EXAMPLES=OFF diff --git a/zstd/CMakeLists.txt b/zstd/CMakeLists.txt index 9de9ebb0..181b66c6 100644 --- a/zstd/CMakeLists.txt +++ b/zstd/CMakeLists.txt @@ -14,6 +14,7 @@ if (ENABLE_ZSTD) #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zstd.patch CMAKE_ARGS ${BUILD_TYPE_SPECIFIER} + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DZ_PREFIX_STR=${Z_PREFIX_STR} -DBIN_DIR=${BIN_DIR} -DLIB_DIR=${LIB_DIR}