Skip to content

Commit

Permalink
Merge pull request #518 from stack-of-tasks/topic/update-pixi
Browse files Browse the repository at this point in the history
Update pixi lockfile
  • Loading branch information
jorisv authored Dec 3, 2024
2 parents 56e3381 + 5e997d1 commit 6b77666
Show file tree
Hide file tree
Showing 3 changed files with 1,253 additions and 1,220 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/update_pixi_lockfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
body-path: diff.md
branch: topic/update-pixi
base: devel
labels: pixi
labels: |
pixi
no changelog
delete-branch: true
add-paths: pixi.lock
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,26 @@ option(SUFFIX_SO_VERSION "Suffix library name with its version" OFF)
option(BUILD_TESTING_SCIPY
"Build the SciPy tests (scipy should be installed on the machine)" ON)

# ----------------------------------------------------
# --- Policy -----------------------------------------
# CMake Policy setup
# ----------------------------------------------------
# Policy can be removed when cmake_minimum_required is updated.

# We also set CMAKE_POLICY_DEFAULT_CMPXXXX because CMake modules can reset
# policy and redefine some macros like `find_dependency` that will not use our
# policy.

# Use BoostConfig module distributed by boost library instead of using FindBoost
# module distributed by CMake
# module distributed by CMake (to remove in 3.30).
if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
endif()
# install() DESTINATION paths are normalized (to remove in 3.31).
if(POLICY CMP0177)
cmake_policy(SET CMP0177 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0177 NEW)
endif()
include("${JRL_CMAKE_MODULES}/base.cmake")
compute_project_args(PROJECT_ARGS LANGUAGES CXX)
Expand Down
Loading

0 comments on commit 6b77666

Please sign in to comment.