Skip to content

Commit

Permalink
Hmm - looks like flake naming was coming from MANIFOLD_PAR - try tran…
Browse files Browse the repository at this point in the history
…slating the settings.
  • Loading branch information
starseeker committed Sep 28, 2024
1 parent 68f2c98 commit e1588ea
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ set(MANIFOLD_VERSION_MINOR 5)
set(MANIFOLD_VERSION_PATCH 1)
set(MANIFOLD_VERSION "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}")

# Correct MANIFOLD_PAR values to on/off (previous NONE/TBB values should still
# work this way)
if (DEFINED MANIFOLD_PAR)
if ("${MANIFOLD_PAR}" STREQUAL "" OR "${MANIFOLD_PAR}" STREQUAL "NONE")
set(MANIFOLD_PAR OFF CACHE BOOL "Normalized MANIFOLD_PAR setting")
else()
set(MANIFOLD_PAR ON CACHE BOOL "Normalized MANIFOLD_PAR setting")
endif ()
endif ()

# Primary user facing options
option(MANIFOLD_CROSS_SECTION "Build CrossSection for 2D support" ON)
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
src = clipper2-src;
});
manifold =
{ parallel-backend ? "off"
{ parallel-backend ? "none"
, doCheck ? true
, build-tools ? [ ]
, ...
Expand Down Expand Up @@ -60,9 +60,9 @@
'';
};
parallelBackends = [
{ parallel-backend = "off"; }
{ parallel-backend = "none"; }
{
parallel-backend = "on";
parallel-backend = "tbb";
build-tools = with pkgs; [ tbb pkg-config ];
}
];
Expand Down

0 comments on commit e1588ea

Please sign in to comment.