elalish · wtholliday · Sep 21, 2024 · Sep 21, 2024 · Sep 25, 2024 · Sep 25, 2024
diff --git a/.swiftpm/xcode/xcuserdata/holliday.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/holliday.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>manifold.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,33 @@
+{
+  "originHash" : "3e2f64f29576d5c20d33a6b24091e7d829288ea5ac3d2f3c511a81a1b60bbab2",
+  "pins" : [
+    {
+      "identity" : "clipper2",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/audulus/Clipper2",
+      "state" : {
+        "branch" : "spm",
+        "revision" : "73a65374f4fec1682bf6af8855e177aa1b02ea3c"
+      }
+    },
+    {
+      "identity" : "glm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/audulus/glm",
+      "state" : {
+        "branch" : "spm",
+        "revision" : "ad839f90fcd1e630ae134d12b0f21c1d80c58271"
+      }
+    },
+    {
+      "identity" : "tbb-spm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/audulus/tbb-spm",
+      "state" : {
+        "branch" : "main",
+        "revision" : "3b7877905112736ef6143e990ac9f07434d0abdf"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,31 @@
+// swift-tools-version:5.10
+import PackageDescription
+
+let package = Package(
+    name: "manifold",
+    platforms: [
+        .macOS(.v11), .iOS(.v13)
+    ],
+    products: [
+        .library(
+            name: "manifold",
+            targets: ["manifold"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/audulus/glm", branch: "spm"),
+        .package(url: "https://github.com/audulus/Clipper2", branch: "spm"),
+        .package(url: "https://github.com/audulus/tbb-spm", branch: "main"),
+    ],
+    targets: [
+        .target(
+            name: "manifold",
+            dependencies: ["glm", "Clipper2", .product(name: "tbb", package: "tbb-spm")],
+            path: "src",
+            publicHeadersPath: "include",
+            cxxSettings: [
+                .define("MANIFOLD_PAR", to: "'T'"),
+            ]
+        )
+    ],
+    cxxLanguageStandard: .cxx20
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,10 +12,70 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-add_subdirectory(utilities)
-add_subdirectory(collider)
-if(MANIFOLD_CROSS_SECTION)
-    add_subdirectory(cross_section)
+project(manifold)
+
+add_library(${PROJECT_NAME} INTERFACE)
+message("Parallel Backend: ${MANIFOLD_PAR}")
+
+include(FetchContent)
+if (TRACY_ENABLE)
+    include(FetchContent)
+    FetchContent_Declare(tracy
+        GIT_REPOSITORY https://github.com/wolfpld/tracy.git
+        GIT_TAG v0.10
+        GIT_SHALLOW TRUE
+        GIT_PROGRESS TRUE
+    )
+    FetchContent_MakeAvailable(tracy)
+    target_link_libraries(${PROJECT_NAME} INTERFACE TracyClient)
+endif()
+
+if(MANIFOLD_PAR STREQUAL "TBB")
+    target_compile_options(${PROJECT_NAME} INTERFACE -DMANIFOLD_PAR='T')
+    if(TARGET TBB::tbb)
+        target_link_libraries(${PROJECT_NAME} INTERFACE TBB::tbb)
+    else()
+        target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${TBB_INCLUDE_DIRS}>)
+        target_link_libraries(${PROJECT_NAME} INTERFACE ${TBB_LINK_LIBRARIES})
+    endif()
+    if(APPLE)
+        if(oneDPL_FOUND)
+            target_link_libraries(${PROJECT_NAME} INTERFACE oneDPL)
+        else()
+            message(WARNING "oneDPL not found, sequential implementation is used instead")
+        endif()
+    endif()
+elseif(MANIFOLD_PAR STREQUAL "NONE")
+    set(MANIFOLD_PAR "CPP")
+else()
+    message(FATAL_ERROR "Invalid value for MANIFOLD_PAR: ${MANIFOLD_PAR}. "
+        "Should be \"TBB\" or \"NONE\"")
 endif()
-add_subdirectory(polygon)
-add_subdirectory(manifold)
+
+target_include_directories(${PROJECT_NAME} INTERFACE
+    $<INSTALL_INTERFACE:include>
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
+target_link_libraries(${PROJECT_NAME} INTERFACE glm::glm)
+
+if(MANIFOLD_EXCEPTIONS)
+    target_compile_options(${PROJECT_NAME} INTERFACE
+        -DMANIFOLD_EXCEPTIONS=1
+    )
+endif()
+
+if(MANIFOLD_DEBUG)
+    target_compile_options(${PROJECT_NAME}
+        INTERFACE -DMANIFOLD_DEBUG)
+endif()
+
+target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17)
+
+install(TARGETS ${PROJECT_NAME} EXPORT manifoldTargets)
+install(FILES
+    include/manifold/common.h
+    include/manifold/vec_view.h
+    include/manifold/tri_dist.h
+    include/manifold/optional_assert.h
+    include/manifold/iters.h
+    include/manifold/parallel.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME})
diff --git a/src/manifold/src/boolean3.cpp → src/boolean3.cpp b/src/manifold/src/boolean3.cpp → src/boolean3.cpp
diff --git a/src/manifold/src/boolean3.h → src/boolean3.h b/src/manifold/src/boolean3.h → src/boolean3.h
diff --git a/src/manifold/src/boolean_result.cpp → src/boolean_result.cpp b/src/manifold/src/boolean_result.cpp → src/boolean_result.cpp
diff --git a/src/collider/CMakeLists.txt b/src/collider/CMakeLists.txt
diff --git a/src/manifold/src/constructors.cpp → src/constructors.cpp b/src/manifold/src/constructors.cpp → src/constructors.cpp
diff --git a/src/cross_section/src/cross_section.cpp → src/cross_section.cpp b/src/cross_section/src/cross_section.cpp → src/cross_section.cpp
diff --git a/src/cross_section/CMakeLists.txt b/src/cross_section/CMakeLists.txt
diff --git a/src/manifold/src/csg_tree.cpp → src/csg_tree.cpp b/src/manifold/src/csg_tree.cpp → src/csg_tree.cpp
diff --git a/src/manifold/src/csg_tree.h → src/csg_tree.h b/src/manifold/src/csg_tree.h → src/csg_tree.h
diff --git a/src/manifold/src/edge_op.cpp → src/edge_op.cpp b/src/manifold/src/edge_op.cpp → src/edge_op.cpp
diff --git a/src/manifold/src/face_op.cpp → src/face_op.cpp b/src/manifold/src/face_op.cpp → src/face_op.cpp
diff --git a/src/manifold/src/impl.cpp → src/impl.cpp b/src/manifold/src/impl.cpp → src/impl.cpp
diff --git a/src/manifold/src/impl.h → src/impl.h b/src/manifold/src/impl.h → src/impl.h
diff --git a/src/collider/include/manifold/collider.h → src/include/manifold/collider.h b/src/collider/include/manifold/collider.h → src/include/manifold/collider.h
diff --git a/src/utilities/include/manifold/common.h → src/include/manifold/common.h b/src/utilities/include/manifold/common.h → src/include/manifold/common.h
diff --git a/..._section/include/manifold/cross_section.h → src/include/manifold/cross_section.h b/..._section/include/manifold/cross_section.h → src/include/manifold/cross_section.h
diff --git a/src/utilities/include/manifold/hashtable.h → src/include/manifold/hashtable.h b/src/utilities/include/manifold/hashtable.h → src/include/manifold/hashtable.h
diff --git a/src/utilities/include/manifold/iters.h → src/include/manifold/iters.h b/src/utilities/include/manifold/iters.h → src/include/manifold/iters.h
diff --git a/src/manifold/include/manifold/manifold.h → src/include/manifold/manifold.h b/src/manifold/include/manifold/manifold.h → src/include/manifold/manifold.h
diff --git a/...lities/include/manifold/optional_assert.h → src/include/manifold/optional_assert.h b/...lities/include/manifold/optional_assert.h → src/include/manifold/optional_assert.h
diff --git a/src/utilities/include/manifold/parallel.h → src/include/manifold/parallel.h b/src/utilities/include/manifold/parallel.h → src/include/manifold/parallel.h
diff --git a/src/polygon/include/manifold/polygon.h → src/include/manifold/polygon.h b/src/polygon/include/manifold/polygon.h → src/include/manifold/polygon.h
diff --git a/src/utilities/include/manifold/sparse.h → src/include/manifold/sparse.h b/src/utilities/include/manifold/sparse.h → src/include/manifold/sparse.h
diff --git a/src/utilities/include/manifold/svd.h → src/include/manifold/svd.h b/src/utilities/include/manifold/svd.h → src/include/manifold/svd.h
diff --git a/src/utilities/include/manifold/tri_dist.h → src/include/manifold/tri_dist.h b/src/utilities/include/manifold/tri_dist.h → src/include/manifold/tri_dist.h
diff --git a/src/utilities/include/manifold/utils.h → src/include/manifold/utils.h b/src/utilities/include/manifold/utils.h → src/include/manifold/utils.h
diff --git a/src/utilities/include/manifold/vec.h → src/include/manifold/vec.h b/src/utilities/include/manifold/vec.h → src/include/manifold/vec.h
diff --git a/src/utilities/include/manifold/vec_view.h → src/include/manifold/vec_view.h b/src/utilities/include/manifold/vec_view.h → src/include/manifold/vec_view.h
diff --git a/src/manifold/src/manifold.cpp → src/manifold.cpp b/src/manifold/src/manifold.cpp → src/manifold.cpp
diff --git a/src/manifold/CMakeLists.txt b/src/manifold/CMakeLists.txt
diff --git a/src/manifold/src/mesh_fixes.h → src/mesh_fixes.h b/src/manifold/src/mesh_fixes.h → src/mesh_fixes.h
diff --git a/src/polygon/src/polygon.cpp → src/polygon.cpp b/src/polygon/src/polygon.cpp → src/polygon.cpp
diff --git a/src/polygon/CMakeLists.txt b/src/polygon/CMakeLists.txt
diff --git a/src/manifold/src/properties.cpp → src/properties.cpp b/src/manifold/src/properties.cpp → src/properties.cpp
diff --git a/src/manifold/src/quickhull.cpp → src/quickhull.cpp b/src/manifold/src/quickhull.cpp → src/quickhull.cpp
diff --git a/src/manifold/src/quickhull.h → src/quickhull.h b/src/manifold/src/quickhull.h → src/quickhull.h
diff --git a/src/manifold/src/sdf.cpp → src/sdf.cpp b/src/manifold/src/sdf.cpp → src/sdf.cpp
diff --git a/src/manifold/src/shared.h → src/shared.h b/src/manifold/src/shared.h → src/shared.h
diff --git a/src/manifold/src/smoothing.cpp → src/smoothing.cpp b/src/manifold/src/smoothing.cpp → src/smoothing.cpp
diff --git a/src/manifold/src/sort.cpp → src/sort.cpp b/src/manifold/src/sort.cpp → src/sort.cpp
diff --git a/src/manifold/src/subdivision.cpp → src/subdivision.cpp b/src/manifold/src/subdivision.cpp → src/subdivision.cpp
diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt