Simplify pixi through environments

Author: jleibs

Diff for: .gitignore

@@ -1,6 +1,5 @@
 # Build directories
-build
-buildrerunfindpackage
+build_*
 
 # Pixi environment
 .pixi

Diff for: README.md

@@ -17,10 +17,10 @@ The easiest way to get started is to install [pixi](https://prefix.dev/docs/pixi
 
 The pixi environment described in `pixi.toml` contains all of the dependencies, including the rerun viewer,
 allowing you to run the example with a single command, while the rerun C++ SDK is downloaded via `FetchContent`
-* `pixi run -e default example`
+* `pixi run example`
 
 If you want to also download rerun C++ SDK via pixi, you can run:
-* `pixi run -e rerundfindpackage example`
+* `pixi run example-findpackage`
 
 ## Without `pixi`
 If you choose not to use pixi, you will need to install a few things yourself before you get started.

Diff for: pixi.lock

@@ -21,49 +21,69 @@
 repository = "https://github.com/rerun-io/cpp-example-opencv-eigen"
 version = "0.1.0"
 
+# The following activation scripts make the tasks portable cross-platform.
+#
+# They define:
+# - CMAKE_GENERATOR
+# - BUILD_FOLDER
+# - EXE_PATH
+#
+# In particular, BUILD_FOLDER will be set to either:
+# - build_source
+# - build_findpackage
+# depending on the feature being used.
+[activation]
+scripts = ["pixi/env.sh"]
+
+[target.win-64.activation]
+scripts = ["pixi/env.bat"]
+
+################################################################################
+# Common Tasks
+################################################################################
 
 [tasks]
-# Note: extra CLI argument after `pixi run TASK` are passed to the task cmd.
-clean = { cmd = "rm -rf build bin CMakeFiles/" }
-print-env = { cmd = "echo $PATH" }
 
-[target.win-64.tasks]
-prepare = "cmake -G 'Visual Studio 17 2022' -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=OFF"
-build = { cmd = "cmake --build build --config RelWithDebInfo", depends_on = [
-    "prepare",
-] }
-example = { cmd = "build/RelWithDebInfo/rerun_ext_example.exe", depends_on = [
-    "build",
-] }
+print-env = { cmd = "echo $PATH" }
 
 [target.unix.tasks]
-prepare = "cmake -G 'Ninja' -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=OFF"
-build = { cmd = "cmake --build build --config RelWithDebInfo --target all", depends_on = [
-    "prepare",
-] }
-example = { cmd = "build/rerun_ext_example", depends_on = ["build"] }
+# This task only runs propertly Unix systems.
 format = { cmd = "clang-format -i src/*" }
 
-[feature.rerunfindpackage.target.win-64.tasks]
-prepare = "cmake -G 'Visual Studio 17 2022' -B buildrerunfindpackage -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=ON"
-build = { cmd = "cmake --build buildrerunfindpackage --config RelWithDebInfo", depends_on = [
-    "prepare",
-] }
-example = { cmd = "buildrerunfindpackage/RelWithDebInfo/rerun_ext_example.exe", depends_on = [
-    "build",
-] }
+################################################################################
+# Building Rerun from source via the released bundle.
+################################################################################
+[feature.source.tasks]
+
+# The default behavior will cause rerun to be build from source
+prepare-source = "cmake -B $BUILD_FOLDER -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo"
 
-[feature.rerunfindpackage.target.unix.tasks]
-prepare = "cmake -G 'Ninja' -B buildrerunfindpackage -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=ON"
-build = { cmd = "cmake --build buildrerunfindpackage --config RelWithDebInfo --target all", depends_on = [
-    "prepare",
+build-source = { cmd = "cmake --build $BUILD_FOLDER  --config RelWithDebInfo", depends_on = [
+    "prepare-source",
 ] }
-example = { cmd = "buildrerunfindpackage/rerun_ext_example", depends_on = [
-    "build",
+
+example = { cmd = "$EXE_PATH", depends_on = ["build-source"] }
+
+clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
+
+################################################################################
+# Using Rerun via find_package
+################################################################################
+[feature.findpackage.tasks]
+
+prepare-findpackage = "cmake -B $BUILD_FOLDER -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DRERUN_FIND_PACKAGE:BOOL=ON"
+
+build-findpackage = { cmd = "cmake --build $BUILD_FOLDER  --config RelWithDebInfo", depends_on = [
+    "prepare-findpackage",
 ] }
-format = { cmd = "clang-format -i src/*" }
 
+example-findpackage = { cmd = "$EXE_PATH", depends_on = ["build-findpackage"] }
+
+clean = { cmd = "rm -rf $BUILD_FOLDER bin CMakeFiles/" }
 
+################################################################################
+# Depencencies
+################################################################################
 [dependencies]
 # Build tools:
 clang-tools = ">=15,<16" # clang-format
@@ -84,11 +104,10 @@
 # Build tools:
 vs2022_win-64 = "19.37.32822"
 
-[feature.rerunfindpackage.dependencies]
+[feature.findpackage.dependencies]
 librerun-sdk = "0.17.0.*"
 
 [environments]
 default = { solve-group = "defaultgroup" }
-rerunfindpackage = { features = [
-    "rerunfindpackage",
-], solve-group = "defaultgroup" }
+source = { features = ["source"], solve-group = "defaultgroup" }
+findpackage = { features = ["findpackage"], solve-group = "defaultgroup" }

Diff for: pixi.toml

@@ -0,0 +1,3 @@
+set CMAKE_GENERATOR="Visual Studio 17 2022"
+set BUILD_FOLDER=build_${PIXI_ENVIRONMENT_NAME}
+set EXE_PATH=$BUILD_FOLDER/RelWithDebInfo/rerun_ext_example

Diff for: pixi/env.bat

@@ -0,0 +1,3 @@
+export CMAKE_GENERATOR=Ninja
+export BUILD_FOLDER=build_${PIXI_ENVIRONMENT_NAME}
+export EXE_PATH=$BUILD_FOLDER/rerun_ext_example