Move C and C++ examples to examples/ folder

CMakeLists.txt

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(rerun_cpp_proj LANGUAGES CXX)
+
+add_subdirectory(rerun_cpp) # The Rerun C++ SDK library
+add_subdirectory(examples/cpp/minimal)

examples/c/README.md

@@ -0,0 +1 @@
+The Rerun C SDK is in its infancy, and not ready for production.

crates/rerun_c/example/Makefile → examples/c/minimal/Makefile

@@ -1,7 +1,7 @@
 CC     =  gcc
 CFLAGS =  --std=c99 -O2 -g -DNDEBUG
 CFLAGS += -Wall -Wextra -Wpedantic -Wcast-align -Wcast-qual -Wformat=2 -Wmissing-include-dirs -Wnull-dereference -Woverloaded-virtual -Wpointer-arith -Wshadow -Wswitch-enum -Wvla -Wno-sign-compare -Wconversion -Wunused -Wold-style-cast -Wno-missing-braces
-CFLAGS += -I ../src # Make sure rerun.h is found
+CFLAGS += -I ../../../crates/rerun_c/src # Make sure rerun.h is found
 LDLIBS =
 
 OBJECTS = main.o

examples/cpp/README.md

@@ -0,0 +1 @@
+The Rerun C++ SDK is in its infancy, and not ready for production.

rerun_cpp/example/CMakeLists.txt → examples/cpp/minimal/CMakeLists.txt

@@ -21,6 +21,6 @@ else()
   target_compile_options(rerun_example PRIVATE -Wall -Wextra -Wpedantic -Wcast-align -Wcast-qual -Wformat=2 -Wmissing-include-dirs -Wnull-dereference -Woverloaded-virtual -Wpointer-arith -Wshadow -Wswitch-enum -Wvla -Wno-sign-compare -Wconversion -Wunused -Wold-style-cast -Wno-missing-braces)
 endif()
 
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../src) # For rerun.hpp (Rerun C++ SDK)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../../../rerun_cpp/src) # For rerun.hpp (Rerun C++ SDK)
 
 target_link_libraries(rerun_example PRIVATE loguru::loguru rerun_sdk)

examples/cpp/minimal/README.md

@@ -0,0 +1,5 @@
+# Example of using the Rerun C SDK
+
+```
+make run
+```

rerun_cpp/build_and_run.sh → examples/cpp/minimal/build_and_run.sh

@@ -2,7 +2,7 @@
 
 set -eu
 script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
-cd "$script_path"
+cd "$script_path/../../.."
 set -x
 
 mkdir -p build
@@ -11,5 +11,4 @@ pushd build
     make -j8 # VERBOSE=1
 popd
 
-./build/example/rerun_example
-
+./build/examples/cpp/minimal/rerun_example

rerun_cpp/CMakeLists.txt

@@ -1,6 +1,71 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(rerun_cpp_proj LANGUAGES CXX)
+# NOTE: CMake docs strongly discourages using GLOB, and instead suggests
+# manually listing all the files, like it's 1972.
+# However, that won't work for use since we auto-generate the source tree.
+# See https://cmake.org/cmake/help/latest/command/file.html#glob
+file(GLOB_RECURSE rerun_sdk_SRC CONFIGURE_DEPENDS
+    "*.hpp"
+    "*.cpp"
+)
 
-add_subdirectory(src) # The Rerun C++ SDK library
-add_subdirectory(example)
+add_library(rerun_sdk ${rerun_sdk_SRC})
+
+# ------------------------------------------------------------------------------
+
+# For rerun.h (Rerun C SDK):
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../crates/rerun_c/src)
+
+# Make sure the compiler can find include files for rerun
+# when other libraries or executables link to rerun:
+target_include_directories(rerun_sdk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+# ------------------------------------------------------------------------------
+# Loguru logging library (https://github.com/emilk/loguru):
+set(CMAKE_DL_LIBS "dl") # Required by Loguru for backtraces
+
+# Loguru, see https://github.com/emilk/loguru/blob/master/loguru_cmake_example/CMakeLists.txt
+include(FetchContent)
+FetchContent_Declare(LoguruGitRepo
+    GIT_REPOSITORY "https://github.com/emilk/loguru" # can be a filesystem path
+    GIT_TAG "master"
+)
+
+# set any loguru compile-time flags before calling MakeAvailable()
+set(LOGURU_STACKTRACES 1)
+FetchContent_MakeAvailable(LoguruGitRepo) # defines target 'loguru::loguru'
+
+target_link_libraries(rerun_sdk PRIVATE loguru::loguru)
+
+# ------------------------------------------------------------------------------
+execute_process(COMMAND cargo build -p re_types) # Generates most of the C++ source files
+execute_process(COMMAND cargo build -p rerun_c) # We link against this, so must be up-to-date
+
+# ------------------------------------------------------------------------------
+if(APPLE)
+    target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../target/debug/librerun_c.a)
+    target_link_libraries(rerun_sdk PRIVATE "-framework CoreFoundation" "-framework IOKit")
+endif()
+
+if(LINUX)
+    target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../target/debug/librerun_c.a)
+    target_link_libraries(rerun_sdk PRIVATE "-lm")
+endif()
+
+# -----------------------------------------------------------------------------
+# Arrow:
+option(ARROW_LINK_SHARED "Link to the Arrow shared library" ON)
+
+find_package(Arrow REQUIRED)
+
+# Arrow requires a C++17 compliant compiler
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+message(STATUS "Arrow version: ${ARROW_VERSION}")
+message(STATUS "Arrow SO version: ${ARROW_FULL_SO_VERSION}")
+
+if(ARROW_LINK_SHARED)
+    target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_shared)
+else()
+    target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_static)
+endif()

rerun_cpp/README.md

@@ -6,7 +6,7 @@ This is not yet ready to be used.
 Run `scripts/setup.sh`.
 
 ## Test it
-rerun_cpp/example/build_and_run.sh
+`examples/cpp/minimal/build_and_run.sh``
 
 # To do:
 * CI