Merge pull request #375 from EtienneAr/fix_pixi_build

Small fixes for pixi run build and tracy integrations

Author: ManifoldFR

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added support in Python bindings for `std::string_view` (converting to and from Python's `str` built-in type) (https://github.com/Simple-Robotics/aligator/pull/364)
 - change several classes (including solvers and contact-related modelling) to take `std::string_view` where possible (https://github.com/Simple-Robotics/aligator/pull/364)
 - fixed missing `num_threads` passed to `problem.evaluate()` in `SolverProxDDP::tryLinearStep()` (https://github.com/Simple-Robotics/aligator/pull/373)
+- Fix pixi build and Tracy integration issues: add ninja dependency and update configs (https://github.com/Simple-Robotics/aligator/pull/375)
 
 ### Changed
 

CMakeLists.txt

@@ -287,50 +287,52 @@ list(
 )
 
 option(DOWNLOAD_TRACY "Use FetchContent to install Tracy." OFF)
-if(ALIGATOR_TRACY_ENABLE AND DOWNLOAD_TRACY)
-  # We use FetchContent_Populate because we need EXCLUDE_FROM_ALL to avoid
-  # installing Tracy with aligator. We can directly use EXCLUDE_FROM_ALL in
-  # FetchContent_Declare when CMake minimum version will be 3.28.
-  if(POLICY CMP0169)
-    cmake_policy(SET CMP0169 OLD)
-  endif()
-  FetchContent_Declare(
-    tracy
-    GIT_REPOSITORY https://github.com/Simple-Robotics/tracy.git
-    GIT_TAG patches
-    GIT_SHALLOW TRUE
-    GIT_PROGRESS TRUE
-  )
-  FetchContent_GetProperties(tracy)
-  if(NOT tracy_POPULATED)
-    FetchContent_Populate(tracy)
-    set(TRACY_STATIC ON CACHE INTERNAL "")
-    set(TRACY_ENABLE ${ALIGATOR_TRACY_ENABLE} CACHE INTERNAL "")
-    add_subdirectory(${tracy_SOURCE_DIR} ${tracy_BINARY_DIR} EXCLUDE_FROM_ALL)
-    # Extract the target include directories, set as system
-    get_target_property(
-      tracy_INCLUDE_DIR
-      TracyClient
-      INTERFACE_INCLUDE_DIRECTORIES
-    )
-    set_target_properties(
-      TracyClient
-      PROPERTIES
-        POSITION_INDEPENDENT_CODE True
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${tracy_INCLUDE_DIR}"
-    )
-  endif()
-elseif(ALIGATOR_TRACY_ENABLE)
-  # assume it is installed somewhere
-  ADD_PROJECT_DEPENDENCY(Tracy)
-  if(NOT ${tracy_FOUND})
-    message(
-      FATAL_ERROR
-      "Aligator support for tracy is enabled, but tracy was not found on your system."
-      " Install it, or set the option DOWNLOAD_TRACY to ON so we can fetch it."
+if(ALIGATOR_TRACY_ENABLE)
+  if(DOWNLOAD_TRACY)
+    # We use FetchContent_Populate because we need EXCLUDE_FROM_ALL to avoid
+    # installing Tracy with aligator. We can directly use EXCLUDE_FROM_ALL in
+    # FetchContent_Declare when CMake minimum version will be 3.28.
+    if(POLICY CMP0169)
+      cmake_policy(SET CMP0169 OLD)
+    endif()
+    FetchContent_Declare(
+      tracy
+      GIT_REPOSITORY https://github.com/Simple-Robotics/tracy.git
+      GIT_TAG patches
+      GIT_SHALLOW TRUE
+      GIT_PROGRESS TRUE
     )
+    FetchContent_GetProperties(tracy)
+    if(NOT tracy_POPULATED)
+      FetchContent_Populate(tracy)
+      set(TRACY_STATIC ON CACHE INTERNAL "")
+      set(TRACY_ENABLE ${ALIGATOR_TRACY_ENABLE} CACHE INTERNAL "")
+      add_subdirectory(${tracy_SOURCE_DIR} ${tracy_BINARY_DIR} EXCLUDE_FROM_ALL)
+      # Extract the target include directories, set as system
+      get_target_property(
+        tracy_INCLUDE_DIR
+        TracyClient
+        INTERFACE_INCLUDE_DIRECTORIES
+      )
+      set_target_properties(
+        TracyClient
+        PROPERTIES
+          POSITION_INDEPENDENT_CODE True
+          INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${tracy_INCLUDE_DIR}"
+      )
+    endif()
   else()
-    message(STATUS "Tracy found on your system at ${Tracy_DIR}")
+    # assume it is installed somewhere
+    ADD_PROJECT_DEPENDENCY(Tracy)
+    if(NOT ${Tracy_FOUND})
+      message(
+        FATAL_ERROR
+        "Aligator support for tracy is enabled, but tracy was not found on your system."
+        " Install it, or set the option DOWNLOAD_TRACY to ON so we can fetch it."
+      )
+    else()
+      message(STATUS "Tracy found on your system at ${Tracy_DIR}")
+    endif()
   endif()
 endif()
 
@@ -368,11 +370,17 @@ function(create_library)
   if(BUILD_WITH_OPENMP_SUPPORT)
     target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_CXX)
   endif()
+
+  if(ALIGATOR_TRACY_ENABLE)
+    target_link_libraries(${PROJECT_NAME} PUBLIC Tracy::TracyClient)
+  endif()
+
   target_link_libraries(
     ${PROJECT_NAME}
     PUBLIC Eigen3::Eigen fmt::fmt
     PRIVATE mimalloc
   )
+
   # set the install-tree include dirs used by dependent projects to consume this
   # target
   target_include_directories(

development/pixi/activation.sh

@@ -33,3 +33,4 @@ export ALIGATOR_OPENMP_SUPPORT=${ALIGATOR_OPENMP_SUPPORT:=OFF}
 export ALIGATOR_BENCHMARKS=${ALIGATOR_BENCHMARKS:=ON}
 export ALIGATOR_EXAMPLES=${ALIGATOR_EXAMPLES:=ON}
 export ALIGATOR_PYTHON_STUBS=${ALIGATOR_PYTHON_STUBS:=ON}
+export ALIGATOR_TRACY_ENABLE=${ALIGATOR_TRACY_ENABLE:=OFF}