Skip to content

Commit dc2a34d

Browse files
committed
update wip
1 parent aa97f7f commit dc2a34d

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ project(rerun_external_cpp_proj LANGUAGES CXX)
44

55
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
66

7-
if(NOT DEFINED CMAKE_CXX_STANDARD)
8-
set(CMAKE_CXX_STANDARD 17)
9-
endif()
10-
11-
set(RERUN_CPP_URL "https://github.com/rerun-io/rerun/releases/download/0.21.0/rerun_cpp_sdk.zip" CACHE STRING "URL to the rerun_cpp zip.")
7+
set(RERUN_CPP_URL "https://build.rerun.io/commit/5949a22/rerun_cpp_sdk.zip" CACHE STRING "URL to the rerun_cpp zip.") # TODO: update to published version
128
option(RERUN_FIND_PACKAGE "Whether to use find_package to find a preinstalled rerun package (instead of using FetchContent)." OFF)
139

1410
if(RERUN_FIND_PACKAGE)

pixi.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ format = { cmd = "clang-format -i src/*" }
5959

6060
prepare-fetchcontent = "cmake -B $BUILD_FOLDER -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo"
6161

62-
build-fetchcontent = { cmd = "cmake --build $BUILD_FOLDER --config RelWithDebInfo", depends_on = [
62+
build-fetchcontent = { cmd = "cmake --build $BUILD_FOLDER --config RelWithDebInfo", depends-on = [
6363
"prepare-fetchcontent",
6464
] }
6565

66-
example = { cmd = "$EXE_PATH", depends_on = ["build-fetchcontent"] }
66+
example = { cmd = "$EXE_PATH", depends-on = ["build-fetchcontent"] }
6767

6868
clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
6969

@@ -77,11 +77,11 @@ clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
7777

7878
prepare-findpackage = "cmake -B $BUILD_FOLDER -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=ON"
7979

80-
build-findpackage = { cmd = "cmake --build $BUILD_FOLDER --config RelWithDebInfo", depends_on = [
80+
build-findpackage = { cmd = "cmake --build $BUILD_FOLDER --config RelWithDebInfo", depends-on = [
8181
"prepare-findpackage",
8282
] }
8383

84-
example-findpackage = { cmd = "$EXE_PATH", depends_on = ["build-findpackage"] }
84+
example-findpackage = { cmd = "$EXE_PATH", depends-on = ["build-findpackage"] }
8585

8686
clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
8787

@@ -91,13 +91,13 @@ clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
9191
[dependencies]
9292
# Build tools:
9393
clang-tools = ">=15,<16" # clang-format
94-
cmake = "3.27.6"
94+
cmake = "3.27.6.*"
9595
# Required by this example:
9696
eigen = "3.4.0.*"
9797
opencv = "4.10.0.*"
9898
# Installs the Rerun Python SDK so the user doesn't have to download & install rerun-cli manually.
9999
# TODO(jleibs): In the future we'll want to use a rerun-cli package that only contains the CLI.
100-
rerun-sdk = "0.21.0"
100+
rerun-sdk = "0.21.0.*"
101101

102102
[target.linux-64.dependencies]
103103
sysroot_linux-64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html
@@ -108,14 +108,14 @@ sysroot_linux-aarch64 = ">=2.17,<3" # rustc 1.64+ requires glibc 2.17+, see http
108108
[target.unix.dependencies]
109109
# Build tools:
110110
cxx-compiler = "1.6.0.*"
111-
ninja = "1.11.1"
111+
ninja = "1.11.1.*"
112112

113113
[target.win-64.dependencies]
114114
# Build tools:
115-
vs2022_win-64 = "19.37.32822"
115+
vs2022_win-64 = "19.37.32822.*"
116116

117117
[feature.findpackage.dependencies]
118-
librerun-sdk = "0.21.0"
118+
librerun-sdk = "0.21.0.*"
119119

120120
[environments]
121121
default = { solve-group = "defaultgroup" }

0 commit comments

Comments
 (0)