rerun-io · Wumpf · Oct 29, 2023 · Oct 26, 2023 · Oct 26, 2023 · Oct 27, 2023
diff --git a/.github/workflows/on_push_main.yml b/.github/workflows/on_push_main.yml
@@ -340,13 +340,13 @@ jobs:
             ## CMake fetch-content for C++ SDK
             ```
             include(FetchContent)
-            FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://build.rerun.io/commit/${{ env.SHORT_SHA }}/rerun_cpp_sdk.zip)
+            FetchContent_Declare(rerun_sdk URL https://build.rerun.io/commit/${{ env.SHORT_SHA }}/rerun_cpp_sdk.zip)
             FetchContent_MakeAvailable(rerun_sdk)
             ```
             or
             ```
             include(FetchContent)
-            FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip)
+            FetchContent_Declare(rerun_sdk URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip)
             FetchContent_MakeAvailable(rerun_sdk)
             ```
 

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ crates/re_types_builder/source_hash.txt
 *.a
 *.bin
 *.o
+**/arrow/
 **/build/
 **/CMakeFiles/
 **/CMakeCache.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 project(rerun_cpp_proj LANGUAGES CXX)
 
@@ -61,7 +61,7 @@ endif()
 # If using MSVC, always enable multi-process compiling for all targets.
 # Note that this setting is repeated for rerun_sdk's CMakeLists.txt since it should also work stand-alone.
 if(MSVC)
-    add_compile_options(/MP)
+    add_compile_options("/MP")
 endif()
 
 # Arrow requires a C++17 compliant compiler.

diff --git a/crates/re_sdk/src/global.rs b/crates/re_sdk/src/global.rs
@@ -44,15 +44,15 @@ impl ThreadLocalRecording {
     }
 }
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "windows"))]
 impl Drop for ThreadLocalRecording {
     fn drop(&mut self) {
         if let Some(stream) = self.stream.take() {
             // Work-around for https://github.com/rerun-io/rerun/issues/2889
             // Calling drop on `self.stream` will panic the calling thread.
             // But we want to make sure we don't loose the data in the stream.
             // So how?
-            re_log::warn!("Using thread-local RecordingStream on macOS can result in data loss because of https://github.com/rerun-io/rerun/issues/3937");
+            re_log::warn!("Using thread-local RecordingStream on macOS & Windows can result in data loss because of https://github.com/rerun-io/rerun/issues/3937");
 
             // Give the batcher and sink threads a chance to process the data.
             std::thread::sleep(std::time::Duration::from_millis(500));

diff --git a/crates/re_viewer/data/quick_start_guides/cpp_connect.md b/crates/re_viewer/data/quick_start_guides/cpp_connect.md
@@ -24,7 +24,7 @@ If you're using CMake, you can add the following to your `CMakeLists.txt`:
 
 ```cmake
 include(FetchContent)
-FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
+FetchContent_Declare(rerun_sdk URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
 FetchContent_MakeAvailable(rerun_sdk)
 ```
 

diff --git a/docs/code-examples/CMakeLists.txt b/docs/code-examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # Setup builds for examples
 file(GLOB sources_list true ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)

diff --git a/docs/code-examples/roundtrips.py b/docs/code-examples/roundtrips.py
@@ -153,12 +153,21 @@ def main() -> None:
     if not args.no_py:
         active_languages.append("py")
 
+    # Running CMake in parallel causes failures during rerun_sdk & arrow build.
+    # TODO(andreas): Tell cmake in a single command to build everything at once.
+    if not args.no_cpp_build:
+        for example in examples:
+            example_opt_out_entirely = opt_out_run.get(example, [])
+            if "cpp" in example_opt_out_entirely:
+                continue
+            run_example(example, "cpp", args)
+
     with multiprocessing.Pool() as pool:
         jobs = []
         for example in examples:
             example_opt_out_entirely = opt_out_run.get(example, [])
             for language in active_languages:
-                if language in example_opt_out_entirely:
+                if language in example_opt_out_entirely or language == "cpp": # cpp already processed in series.
                     continue
                 job = pool.apply_async(run_example, (example, language, args))
                 jobs.append(job)

diff --git a/docs/content/getting-started/cpp.md b/docs/content/getting-started/cpp.md
@@ -32,7 +32,7 @@ add_executable(example_minimal main.cpp)
 You can add Rerun to your project using `FetchContent`
 ```cmake
 include(FetchContent)
-FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
+FetchContent_Declare(rerun_sdk URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
 FetchContent_MakeAvailable(rerun_sdk)
 ```
 This will download a bundle with pre-built Rerun C static libraries for most desktop platforms, all Rerun C++ sources and headers, as well as CMake build instructions for them.
@@ -49,14 +49,14 @@ target_link_libraries(example_minimal PRIVATE rerun_sdk)
 
 Combining the above, a minimal self-contained `CMakeLists.txt` looks like:
 ```cmake
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 project(example_minimal LANGUAGES CXX)
 
 add_executable(example_minimal main.cpp)
 
 # Download the rerun_sdk
 include(FetchContent)
-FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP ON URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
+FetchContent_Declare(rerun_sdk URL https://github.com/rerun-io/rerun/releases/download/prerelease/rerun_cpp_sdk.zip) # TODO(#3962): update link
 FetchContent_MakeAvailable(rerun_sdk)
 
 # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/examples/cpp/clock/CMakeLists.txt b/examples/cpp/clock/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # If you use the example outside of the Rerun SDK you need to specify
 # where the rerun_c build is to be found by setting the `RERUN_CPP_URL` variable.
@@ -16,7 +16,7 @@ else()
 
     # Download the rerun_sdk
     include(FetchContent)
-    FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP YES URL ${RERUN_CPP_URL})
+    FetchContent_Declare(rerun_sdk URL ${RERUN_CPP_URL})
     FetchContent_MakeAvailable(rerun_sdk)
 
     # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/examples/cpp/custom_component_adapter/CMakeLists.txt b/examples/cpp/custom_component_adapter/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # If you use the example outside of the Rerun SDK you need to specify
 # where the rerun_c build is to be found by setting the `RERUN_CPP_URL` variable.
@@ -16,7 +16,7 @@ else()
 
     # Download the rerun_sdk
     include(FetchContent)
-    FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP YES URL ${RERUN_CPP_URL})
+    FetchContent_Declare(rerun_sdk URL ${RERUN_CPP_URL})
     FetchContent_MakeAvailable(rerun_sdk)
 
     # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/examples/cpp/dna/CMakeLists.txt b/examples/cpp/dna/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # If you use the example outside of the Rerun SDK you need to specify
 # where the rerun_c build is to be found by setting the `RERUN_CPP_URL` variable.
@@ -16,7 +16,7 @@ else()
 
     # Download the rerun_sdk
     include(FetchContent)
-    FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP YES URL ${RERUN_CPP_URL})
+    FetchContent_Declare(rerun_sdk URL ${RERUN_CPP_URL})
     FetchContent_MakeAvailable(rerun_sdk)
 
     # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/examples/cpp/minimal/CMakeLists.txt b/examples/cpp/minimal/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # If you use the example outside of the Rerun SDK you need to specify
 # where the rerun_c build is to be found by setting the `RERUN_CPP_URL` variable.
@@ -17,7 +17,7 @@ else()
 
     # Download the rerun_sdk
     include(FetchContent)
-    FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP YES URL ${RERUN_CPP_URL})
+    FetchContent_Declare(rerun_sdk URL ${RERUN_CPP_URL})
     FetchContent_MakeAvailable(rerun_sdk)
 
     # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/examples/cpp/spawn_viewer/CMakeLists.txt b/examples/cpp/spawn_viewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.16...3.27)
 
 # If you use the example outside of the Rerun SDK you need to specify
 # where the rerun_c build is to be found by setting the `RERUN_CPP_URL` variable.
@@ -16,7 +16,7 @@ else()
 
     # Download the rerun_sdk
     include(FetchContent)
-    FetchContent_Declare(rerun_sdk DOWNLOAD_EXTRACT_TIMESTAMP YES URL ${RERUN_CPP_URL})
+    FetchContent_Declare(rerun_sdk URL ${RERUN_CPP_URL})
     FetchContent_MakeAvailable(rerun_sdk)
 
     # Rerun requires at least C++17, but it should be compatible with newer versions.

diff --git a/pixi.toml b/pixi.toml
@@ -93,7 +93,6 @@ cpp-test = { cmd = "export RERUN_STRICT=1 && ./build/rerun_cpp/tests/rerun_sdk_t
 ] }
 
 [dependencies]
-arrow-cpp = "10.0.1"
 attrs = ">=23.1.0"
 blackdoc = "0.3.8"
 clang-tools = ">=15,<16"