--- thirdparty/CMakeLists.txt.orig 2026-01-30 15:43:06 UTC +++ thirdparty/CMakeLists.txt @@ -16,50 +16,50 @@ endfunction () include (${ARGV}) endfunction () -set (SUBMODULES_MISSING FALSE) -foreach (path IN ITEMS - brotli/LICENSE - gtest/LICENSE - libbacktrace/LICENSE - libpng/LICENSE - snappy/COPYING - zlib/README - zstd/LICENSE - directxmath/LICENSE -) - if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${path}") - message (SEND_ERROR "error: ${CMAKE_CURRENT_SOURCE_DIR}/${path} does not exist") - set (SUBMODULES_MISSING TRUE) - endif () -endforeach () -if (SUBMODULES_MISSING) - message (FATAL_ERROR "Update Git submodules by running\ngit submodule update --init --depth 1 --recursive") -endif () +#set (SUBMODULES_MISSING FALSE) +#foreach (path IN ITEMS +# brotli/LICENSE +# gtest/LICENSE +# libbacktrace/LICENSE +# libpng/LICENSE +# snappy/COPYING +# zlib/README +# zstd/LICENSE +# directxmath/LICENSE +#) +# if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${path}") +# message (SEND_ERROR "error: ${CMAKE_CURRENT_SOURCE_DIR}/${path} does not exist") +# set (SUBMODULES_MISSING TRUE) +# endif () +#endforeach () +#if (SUBMODULES_MISSING) +# message (FATAL_ERROR "Update Git submodules by running\ngit submodule update --init --depth 1 --recursive") +#endif () -if (ENABLE_STATIC_SNAPPY OR NOT Snappy_FOUND) - message (STATUS "Using bundled Snappy") - include_with_scope (snappy.cmake) -endif () +#if (ENABLE_STATIC_SNAPPY OR NOT Snappy_FOUND) +# message (STATUS "Using bundled Snappy") +# include_with_scope (snappy.cmake) +#endif () -if (NOT ZLIB_FOUND) - message (STATUS "Using bundled ZLIB") - include_with_scope (zlib.cmake) -endif () +#if (NOT ZLIB_FOUND) +# message (STATUS "Using bundled ZLIB") +# include_with_scope (zlib.cmake) +#endif () -if (NOT PNG_FOUND) - message (STATUS "Using bundled PNG") - include_with_scope (libpng.cmake) -endif () +#if (NOT PNG_FOUND) +# message (STATUS "Using bundled PNG") +# include_with_scope (libpng.cmake) +#endif () -if (NOT BROTLIDEC_FOUND OR NOT BROTLIENC_FOUND) - message (STATUS "Using bundled Brotli") - include_with_scope (brotli.cmake) -endif () +#if (NOT BROTLIDEC_FOUND OR NOT BROTLIENC_FOUND) +# message (STATUS "Using bundled Brotli") +# include_with_scope (brotli.cmake) +#endif () -if (NOT ZSTD_FOUND) - message (STATUS "Using bundled zstd") - include_with_scope (zstd.cmake) -endif () +#if (NOT ZSTD_FOUND) +# message (STATUS "Using bundled zstd") +# include_with_scope (zstd.cmake) +#endif () # Seekable format (builds on top of Zstd -- included in the source but not part # of the shipped library) @@ -72,28 +72,43 @@ target_include_directories(zstd_seekable PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zstd/lib/common ${CMAKE_CURRENT_SOURCE_DIR}/zstd/contrib/seekable_format ) + target_link_libraries (zstd_seekable PUBLIC PkgConfig::ZSTD ) if(NOT MSVC) - # Disable specific warnings that are common in zstd + # Disable specific warnings that are common in zstd target_compile_options(zstd_seekable PRIVATE -Wno-uninitialized) endif() target_optimize(zstd_seekable) -if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") - include_with_scope (libbacktrace.cmake) -endif () +#if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") +# include_with_scope (libbacktrace.cmake) +#endif () -if (BUILD_TESTING) - # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt - if (NOT GTEST_FOUND) - message (STATUS "Using bundled GTest") - include_with_scope (gtest.cmake) - endif () -endif () +#if (BUILD_TESTING) +# # We use non-standard C++ flags, so we can't just use GTest's CMakeLists.txt +# if (NOT GTEST_FOUND) +# message (STATUS "Using bundled GTest") +# include_with_scope (gtest.cmake) +# endif () +#endif () + +find_path(Snappy_INCLUDE_DIR NAMES snappy.h + PATHS ${Snappy_ROOT_DIR} ${Snappy_ROOT_DIR}/include /usr/local/include) + +find_library(Snappy_LIBRARIES NAMES snappy + PATHS ${Snappy_ROOT_DIR} ${Snappy_ROOT_DIR}/lib /usr/local/lib) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Snappy DEFAULT_MSG Snappy_INCLUDE_DIR Snappy_LIBRARIES) + +if(SNAPPY_FOUND) + message(STATUS "Found Snappy (include: ${Snappy_INCLUDE_DIR}, library: ${Snappy_LIBRARIES})") + mark_as_advanced(Snappy_INCLUDE_DIR Snappy_LIBRARIES) +endif() if (MSVC) add_subdirectory (getopt)