From e91b7802f3424ab094c1e29ac57553b662ad7ecc Mon Sep 17 00:00:00 2001 From: egolearner Date: Tue, 2 Jun 2026 16:23:37 +0800 Subject: [PATCH] feat(ci): enable sccache on Windows and propagate compiler launcher to ExternalProject (#439) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(ci): enable sccache on Windows and propagate compiler launcher to ExternalProject Windows CI builds were ~6-9x slower than other platforms (35-40 min vs 4-7 min) due to missing compiler cache. This commit enables sccache for Windows and ensures all ExternalProject_Add dependencies (Arrow, lz4) receive the compiler launcher on every platform. Changes: MSVC /Zi → /Z7 compatibility: - Replace /Zi with /Z7 in root CMakeLists.txt for DEBUG and RELWITHDEBINFO configurations (MSVC cache variable level) - Patch rocksdb, antlr4, and googletest source CMakeLists to replace hardcoded /Zi with /Z7 at the source, eliminating D9025 warnings - Clear COMPILE_PDB_NAME on googletest targets to prevent CMake from adding /Fd, which causes sccache to look for nonexistent .pdb - Remove /FS (forced synchronous PDB writes) from Arrow ExternalProject MSVC flags — unnecessary with /Z7 Windows CI workflow: - Add mozilla-actions/sccache-action@v0.0.10 - Set SCCACHE_GHA_ENABLED=true to use GitHub Actions Cache backend - Pass CMAKE_C/CXX_COMPILER_LAUNCHER=sccache via --config-settings Compiler launcher propagation: - Propagate CMAKE_C/CXX_COMPILER_LAUNCHER to Arrow ExternalProject on all platforms (Windows, Linux, macOS, Android, iOS) - Propagate to lz4 ExternalProject on Windows via CMAKE_ARGS, using CMP0141=NEW + CMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded for /Z7 --- .github/workflows/05-windows-build.yml | 19 +++++++++++++++-- CMakeLists.txt | 9 +++++++- thirdparty/antlr/CMakeLists.txt | 5 +++++ thirdparty/antlr/antlr4.windows.patch | 17 +++++++++++++++ thirdparty/arrow/CMakeLists.txt | 21 +++++++++++++------ thirdparty/googletest/CMakeLists.txt | 14 +++++++++++++ .../googletest/googletest.windows.patch | 14 +++++++++++++ thirdparty/lz4/CMakeLists.txt | 3 +++ thirdparty/rocksdb/CMakeLists.txt | 5 +++++ thirdparty/rocksdb/rocksdb.windows.patch | 13 ++++++++++++ 10 files changed, 111 insertions(+), 9 deletions(-) create mode 100644 thirdparty/antlr/antlr4.windows.patch create mode 100644 thirdparty/googletest/googletest.windows.patch create mode 100644 thirdparty/rocksdb/rocksdb.windows.patch diff --git a/.github/workflows/05-windows-build.yml b/.github/workflows/05-windows-build.yml index 0db11c2..5c42ed9 100644 --- a/.github/workflows/05-windows-build.yml +++ b/.github/workflows/05-windows-build.yml @@ -20,6 +20,9 @@ jobs: - platform: windows-2022 - platform: windows-2025 + env: + SCCACHE_GHA_ENABLED: "true" + steps: - name: Show env info run: | @@ -38,6 +41,9 @@ jobs: git submodule foreach --recursive 'git reset --hard && git clean -ffdx' shell: powershell + - name: Setup sccache + uses: mozilla-actions/sccache-action@v0.0.10 + - name: Set up Python uses: actions/setup-python@v6 with: @@ -76,7 +82,9 @@ jobs: $env:CMAKE_BUILD_PARALLEL_LEVEL = "$env:NPROC" python -m pip install -v . ` --no-build-isolation ` - --config-settings='cmake.define.BUILD_TOOLS=ON' + --config-settings='cmake.define.BUILD_TOOLS=ON' ` + --config-settings='cmake.define.CMAKE_C_COMPILER_LAUNCHER=sccache' ` + --config-settings='cmake.define.CMAKE_CXX_COMPILER_LAUNCHER=sccache' shell: powershell - name: Run C++ Tests @@ -96,7 +104,9 @@ jobs: cd "$env:GITHUB_WORKSPACE\examples\c++" mkdir build cd build - cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release + cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release ` + -DCMAKE_C_COMPILER_LAUNCHER=sccache ` + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache cmake --build . --config Release --parallel $env:NPROC # Copy zvec.dll next to the example executables so Windows can find it. @@ -125,4 +135,9 @@ jobs: .\db-example.exe .\core-example.exe .\ailego-example.exe + shell: powershell + + - name: Show sccache statistics + if: always() + run: sccache --show-stats shell: powershell \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index fbeee4e..7e75d54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,14 @@ set(CC_CXX_STANDARD 17) if(MSVC) set(INTTYPES_FORMAT VC7) - add_compile_options(/FS) # handle .pdb concurrency + # Use /Z7 (embed debug info in .obj) instead of /Zi (separate .pdb) to enable sccache/ccache. + # Use CACHE FORCE so it propagates into thirdparty subdirectories that call project(). + foreach(_cfg DEBUG RELWITHDEBINFO) + foreach(_lang C CXX) + string(REPLACE "/Zi" "/Z7" _flags "${CMAKE_${_lang}_FLAGS_${_cfg}}") + set(CMAKE_${_lang}_FLAGS_${_cfg} "${_flags}" CACHE STRING "" FORCE) + endforeach() + endforeach() add_compile_options(/EHsc) # def c++ exception behavior add_compile_options(/Zc:preprocessor /Zc:__cplusplus) add_compile_options(/we4716) # -Werror=return-type diff --git a/thirdparty/antlr/CMakeLists.txt b/thirdparty/antlr/CMakeLists.txt index e176996..75709ad 100644 --- a/thirdparty/antlr/CMakeLists.txt +++ b/thirdparty/antlr/CMakeLists.txt @@ -1,6 +1,11 @@ set(ANTLR_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/antlr4) set(ANTLR_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/antlr4.patch) apply_patch_once("antlr4_fix" "${ANTLR_SRC_DIR}" "${ANTLR_PATCH}") +if(MSVC) + # Replace /Zi with /Z7 for sccache compatibility (/Z7 embeds debug info in .obj, no .pdb). + set(ANTLR_WINDOWS_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/antlr4.windows.patch) + apply_patch_once("antlr4_windows_fix" "${ANTLR_SRC_DIR}" "${ANTLR_WINDOWS_PATCH}") +endif() if(MSVC) set(WITH_STATIC_CRT ${ZVEC_USE_STATIC_CRT} CACHE BOOL "" FORCE) diff --git a/thirdparty/antlr/antlr4.windows.patch b/thirdparty/antlr/antlr4.windows.patch new file mode 100644 index 0000000..147c460 --- /dev/null +++ b/thirdparty/antlr/antlr4.windows.patch @@ -0,0 +1,17 @@ +diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt +index 1234567..abcdefg 100644 +--- a/runtime/Cpp/CMakeLists.txt ++++ b/runtime/Cpp/CMakeLists.txt +@@ -85,10 +85,10 @@ endif() + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}") + if(MSVC_VERSION) +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MP ${MY_CXX_WARNING_FLAGS}") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Z7 /MP ${MY_CXX_WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /O1 /Oi /Ob2 /Gy /MP /DNDEBUG ${MY_CXX_WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Oi /Ob2 /Gy /MP /DNDEBUG ${MY_CXX_WARNING_FLGAS}") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /O2 /Oi /Ob2 /Gy /MP /Zi ${MY_CXX_WARNING_FLAGS}") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /O2 /Oi /Ob2 /Gy /MP /Z7 ${MY_CXX_WARNING_FLAGS}") + else() + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g ${MY_CXX_WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG ${MY_CXX_WARNING_FLAGS}") diff --git a/thirdparty/arrow/CMakeLists.txt b/thirdparty/arrow/CMakeLists.txt index 0c4603b..973d4b3 100644 --- a/thirdparty/arrow/CMakeLists.txt +++ b/thirdparty/arrow/CMakeLists.txt @@ -49,13 +49,22 @@ if(USE_OSS_MIRROR) message(STATUS "Using OSS mirror for third-party downloads") endif() +# Propagate compiler launcher (ccache/sccache) to Arrow's ExternalProject +set(_ARROW_COMPILER_LAUNCHER_ARGS "") +if(CMAKE_C_COMPILER_LAUNCHER) + set(_ARROW_COMPILER_LAUNCHER_ARGS + -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} + -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} + ) +endif() + if(ANDROID) ExternalProject_Add( ARROW.BUILD PREFIX arrow SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/apache-arrow-21.0.0 DOWNLOAD_COMMAND "" BUILD_IN_SOURCE false - CONFIGURE_COMMAND env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DARROW_WITH_MUSL=OFF "/cpp" + CONFIGURE_COMMAND env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} ${_ARROW_COMPILER_LAUNCHER_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} -DARROW_WITH_MUSL=OFF "/cpp" BUILD_COMMAND "${CMAKE_COMMAND}" --build . --target all -- -j ${NPROC} INSTALL_COMMAND "${CMAKE_COMMAND}" --install "" --prefix=${EXTERNAL_BINARY_DIR}/usr/local BYPRODUCTS ${LIB_PARQUET} ${LIB_ARROW} ${LIB_COMPUTE} ${LIB_ACERO} ${LIB_ARROW_DEPENDS} ${LIB_ARROW_DATASET} @@ -82,7 +91,7 @@ elseif(IOS) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/apache-arrow-21.0.0 DOWNLOAD_COMMAND "" BUILD_IN_SOURCE false - CONFIGURE_COMMAND env ${_arrow_ios_env} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DARROW_CPU_FLAG=${IOS_ARROW_CPU_FLAG} "/cpp" + CONFIGURE_COMMAND env ${_arrow_ios_env} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} ${_ARROW_COMPILER_LAUNCHER_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DARROW_CPU_FLAG=${IOS_ARROW_CPU_FLAG} "/cpp" BUILD_COMMAND env "IPHONEOS_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}" "${CMAKE_COMMAND}" --build . --target all -- -j ${NPROC} INSTALL_COMMAND "${CMAKE_COMMAND}" --install "" --prefix=${EXTERNAL_BINARY_DIR}/usr/local BYPRODUCTS ${LIB_PARQUET} ${LIB_ARROW} ${LIB_COMPUTE} ${LIB_ACERO} ${LIB_ARROW_DEPENDS} ${LIB_ARROW_DATASET} @@ -100,8 +109,8 @@ elseif (MSVC) set(_ARROW_MSVC_RUNTIME "MultiThreadedDLL$<$:Debug>") endif() set(ARROW_EXTRA_CMAKE_ARGS - "-DCMAKE_C_FLAGS=/FS ${_ARROW_CRT_FLAG}" - "-DCMAKE_CXX_FLAGS=/FS ${_ARROW_CRT_FLAG}" + "-DCMAKE_C_FLAGS=${_ARROW_CRT_FLAG}" + "-DCMAKE_CXX_FLAGS=${_ARROW_CRT_FLAG}" -DARROW_USE_STATIC_CRT=${ZVEC_USE_STATIC_CRT} "-DCMAKE_MSVC_RUNTIME_LIBRARY=${_ARROW_MSVC_RUNTIME}" ) @@ -110,7 +119,7 @@ elseif (MSVC) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/apache-arrow-21.0.0 DOWNLOAD_COMMAND "" BUILD_IN_SOURCE false - CONFIGURE_COMMAND "${CMAKE_COMMAND}" -E env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} ${ARROW_EXTRA_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$ -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib "/cpp" + CONFIGURE_COMMAND "${CMAKE_COMMAND}" -E env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} ${ARROW_EXTRA_CMAKE_ARGS} ${_ARROW_COMPILER_LAUNCHER_ARGS} -DCMAKE_BUILD_TYPE=$ -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib "/cpp" BUILD_COMMAND "${CMAKE_COMMAND}" --build . -j ${NPROC} --config $ INSTALL_COMMAND "${CMAKE_COMMAND}" --install "" --prefix=${EXTERNAL_BINARY_DIR}/usr/local --config $ BYPRODUCTS ${LIB_PARQUET} ${LIB_ARROW} ${LIB_COMPUTE} ${LIB_ACERO} ${LIB_ARROW_DEPENDS} ${LIB_ARROW_DATASET} @@ -125,7 +134,7 @@ else () SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/apache-arrow-21.0.0 DOWNLOAD_COMMAND "" BUILD_IN_SOURCE false - CONFIGURE_COMMAND env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib "/cpp" + CONFIGURE_COMMAND env ${CONFIGURE_ENV_LIST} "${CMAKE_COMMAND}" ${CMAKE_CACHE_ARGS} ${_ARROW_COMPILER_LAUNCHER_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_DEBUG_POSTFIX= -DARROW_BUILD_SHARED=OFF -DARROW_ACERO=ON -DARROW_FILESYSTEM=ON -DARROW_DATASET=ON -DARROW_PARQUET=ON -DARROW_COMPUTE=ON -DARROW_WITH_ZLIB=OFF -DARROW_DEPENDENCY_SOURCE=BUNDLED -DARROW_MIMALLOC=OFF -DCMAKE_INSTALL_LIBDIR=lib "/cpp" BUILD_COMMAND "${CMAKE_COMMAND}" --build . --target all -- -j ${NPROC} INSTALL_COMMAND "${CMAKE_COMMAND}" --install "" --prefix=${EXTERNAL_BINARY_DIR}/usr/local BYPRODUCTS ${LIB_PARQUET} ${LIB_ARROW} ${LIB_COMPUTE} ${LIB_ACERO} ${LIB_ARROW_DEPENDS} ${LIB_ARROW_DATASET} diff --git a/thirdparty/googletest/CMakeLists.txt b/thirdparty/googletest/CMakeLists.txt index 4a4badf..610c3cb 100644 --- a/thirdparty/googletest/CMakeLists.txt +++ b/thirdparty/googletest/CMakeLists.txt @@ -13,6 +13,12 @@ if (MSVC) endif() endif () +if(MSVC) + # Replace -Zi with /Z7 for sccache compatibility (/Z7 embeds debug info in .obj, no .pdb). + set(GTEST_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest-1.10.0) + set(GTEST_WINDOWS_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/googletest.windows.patch) + apply_patch_once("googletest_windows_fix" "${GTEST_SRC_DIR}" "${GTEST_WINDOWS_PATCH}") +endif() set(_SAVED_CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${EXTERNAL_LIB_DIR}) @@ -20,6 +26,14 @@ add_subdirectory(googletest-1.10.0) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${_SAVED_CMAKE_ARCHIVE_OUTPUT_DIRECTORY}) unset(_SAVED_CMAKE_ARCHIVE_OUTPUT_DIRECTORY) +# Clear COMPILE_PDB_NAME to prevent CMake from adding /Fd — with /Z7 no .pdb is +# generated, but sccache would try to collect the nonexistent .pdb and fail. +if(MSVC) + foreach(_gt_target gtest gtest_main gmock gmock_main) + set_target_properties(${_gt_target} PROPERTIES COMPILE_PDB_NAME "") + endforeach() +endif() + mark_target_includes_system(gtest gtest_main gmock gmock_main) get_target_property(GTEST_INCLUDE_DIRS gtest INTERFACE_INCLUDE_DIRECTORIES) diff --git a/thirdparty/googletest/googletest.windows.patch b/thirdparty/googletest/googletest.windows.patch new file mode 100644 index 0000000..867c94e --- /dev/null +++ b/thirdparty/googletest/googletest.windows.patch @@ -0,0 +1,14 @@ +diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake +index 1234567..abcdefg 100644 +--- a/googletest/cmake/internal_utils.cmake ++++ b/googletest/cmake/internal_utils.cmake +@@ -72,7 +72,7 @@ macro(config_compiler_and_linker) + fix_default_compiler_settings_() + if (MSVC) + # Newlines inside flags variables break CMake's NMake generator. + # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. +- set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi") ++ set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J /Z7") + set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") + set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") + set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") diff --git a/thirdparty/lz4/CMakeLists.txt b/thirdparty/lz4/CMakeLists.txt index 66c31f1..d7d4bab 100644 --- a/thirdparty/lz4/CMakeLists.txt +++ b/thirdparty/lz4/CMakeLists.txt @@ -101,6 +101,9 @@ if(MSVC) -DBUILD_STATIC_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF + -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} + -DCMAKE_POLICY_DEFAULT_CMP0141=NEW + -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded BUILD_COMMAND "${CMAKE_COMMAND}" --build . --config $ -j INSTALL_COMMAND "${CMAKE_COMMAND}" --install . --config $ BUILD_IN_SOURCE OFF diff --git a/thirdparty/rocksdb/CMakeLists.txt b/thirdparty/rocksdb/CMakeLists.txt index 1844aeb..8d95e88 100644 --- a/thirdparty/rocksdb/CMakeLists.txt +++ b/thirdparty/rocksdb/CMakeLists.txt @@ -19,6 +19,11 @@ elseif(IOS) set(HAS_ARMV8_CRC ON CACHE INTERNAL "Force ARM CRC for iOS arm64") endif() endif() +if(MSVC) + # Replace /Zi with /Z7 for sccache compatibility (/Z7 embeds debug info in .obj, no .pdb). + set(ROCKSDB_WINDOWS_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb.windows.patch) + apply_patch_once("rocksdb_windows_fix" "${ROCKSDB_SRC_DIR}" "${ROCKSDB_WINDOWS_PATCH}") +endif() set(ROCKSDB_BUILD_SHARED OFF CACHE BOOL "Disable install in rocksdb" FORCE) diff --git a/thirdparty/rocksdb/rocksdb.windows.patch b/thirdparty/rocksdb/rocksdb.windows.patch new file mode 100644 index 0000000..4aee603 --- /dev/null +++ b/thirdparty/rocksdb/rocksdb.windows.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1234567..abcdefg 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -186,7 +186,7 @@ endif() + endif() + + if(MSVC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Z7 /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4800 /wd4996 /wd4351 /wd4100 /wd4204 /wd4324") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")