From deedffa84eec3eb2d44084f02157226daa22299f Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 22 Sep 2025 15:01:06 +0500 Subject: [PATCH] build-all.py - alter rocksdb's deps search only on Windows (da4508e) --- cmake/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 43206a840a..25f9d1293d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -340,10 +340,16 @@ endif(USD_SUPPORT) if (WITH_ROCKSDB) # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB # find it's zstd dependency on Windows. - set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG) - set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) + # Only do it on Windows, otherwise it might create problems as + # findzstd and zstd-config target names do not match. + if(WIN32) + set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG) + set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE) + endif() find_package(RocksDB CONFIG REQUIRED) - set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP}) + if(WIN32) + set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP}) + endif() message(STATUS "RocksDB: found at '${RocksDB_DIR}'.") add_definitions(-DIFOPSH_WITH_ROCKSDB)