Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt at simplifying the file structure and CMake build #961

Merged
merged 53 commits into from
Sep 29, 2024
Merged

Attempt at simplifying the file structure and CMake build #961

merged 53 commits into from
Sep 29, 2024

Commits on Sep 29, 2024

  1. Initial file moves, stage logic for src/CMakeLists.txt rework

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9919da3 View commit details
    Browse the repository at this point in the history

  2. Start working on getting reorganized files to build, as well as doing… 

    … some rework on the CMake logic
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e0f28b3 View commit details
    Browse the repository at this point in the history

  3. remove unused libs, propagate dependency includes

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    8b0eea1 View commit details
    Browse the repository at this point in the history

  4. Ignore common temporary files and build directories

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    3884e0d View commit details
    Browse the repository at this point in the history

  5. Just build the C bindings, since this is already a C++ compile - redu… 

    …ces complexity.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f1bc2fc View commit details
    Browse the repository at this point in the history

  6. Fixes for python binding building

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    eda8beb View commit details
    Browse the repository at this point in the history

  7. Require C++17, don't use extensions

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2dfb3bc View commit details
    Browse the repository at this point in the history

  8. Remove C binding CMake file

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    186029c View commit details
    Browse the repository at this point in the history

  9. Remove extra libraries from link line

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    362e1bd View commit details
    Browse the repository at this point in the history

  10. Try to set up the manifoldConfig file to just find the required depen… 

    …dencies, without downloading
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c2ccb1f View commit details
    Browse the repository at this point in the history

  11. Go looking for glm and Clipper2 installed with Manifold first (untested)

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    947bcaa View commit details
    Browse the repository at this point in the history

  12. Use a bundled Clipper2 copy instead of downloading 

    This preserves the ability to disable cross_section (and thus the use of
clipper) but replaces the Download-and-Build fetch with a bundled source
copy to avoid the network connection.  If we go this route, we're also
building Clipper2 directly into Manifold so client libraries don't have
to worry about linking it in.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e075526 View commit details
    Browse the repository at this point in the history

  13. Remove option and directories no longer present

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    fbcd9ba View commit details
    Browse the repository at this point in the history

  14. Remove option no longer present.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    97d6cf5 View commit details
    Browse the repository at this point in the history

  15. Put back the default .gitignore

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    910e9e8 View commit details
    Browse the repository at this point in the history

  16. Add a few more patterns

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a28397e View commit details
    Browse the repository at this point in the history

  17. Revert "Use a bundled Clipper2 copy instead of downloading" 

    Feedback is we don't want to bundle clipper, so revert inclusion

This reverts commit 68e8e3c.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c441106 View commit details
    Browse the repository at this point in the history

  18. Just build polygon as part of the main library

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    8c155d2 View commit details
    Browse the repository at this point in the history

  19. Correct some library linkages

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4e9891d View commit details
    Browse the repository at this point in the history

  20. Tweak exported target file install location - this seems to be what's… 

    … expected on Linux, but will it work for other platforms?
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2360f22 View commit details
    Browse the repository at this point in the history

  21. clang format fixes

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    58970c1 View commit details
    Browse the repository at this point in the history

  22. Just include FetchContent up front

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    fd90612 View commit details
    Browse the repository at this point in the history

  23. Fix include for minimize_testcase

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    3bd58c2 View commit details
    Browse the repository at this point in the history

  24. formatting

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    aad9713 View commit details
    Browse the repository at this point in the history

  25. Add sstream header

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2cd37f7 View commit details
    Browse the repository at this point in the history

  26. Need to disable more code when cross_section is off

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    97ace19 View commit details
    Browse the repository at this point in the history

  27. Don't try to build the bindings unless MANIFOLD_CROSS_SECTION is on.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    566d50a View commit details
    Browse the repository at this point in the history

  28. formatting

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    eed7fa9 View commit details
    Browse the repository at this point in the history

  29. manifoldc folded into libmanifold

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    dd92fb7 View commit details
    Browse the repository at this point in the history

  30. Fix location of test-cmake.sh script

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    d815fa8 View commit details
    Browse the repository at this point in the history

  31. Try using previous install dir for Apple/MSVC manifoldConfig.cmake file 

    Per https://cmake.org/cmake/help/latest/command/find_package.html it
looks like the search is different on different platforms.  Need to look
at the available patterns more closely, but for now try using what's
working for the tests in master branch.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    ae69fe3 View commit details
    Browse the repository at this point in the history

  32. Fix conditional test, add namespace

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    84599cf View commit details
    Browse the repository at this point in the history

  33. Fix header install

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9c30191 View commit details
    Browse the repository at this point in the history

  34. Remove unused bindings filter from lcov line, Remove unused MANIFOLD_… 

    …CBIND option.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0fe3579 View commit details
    Browse the repository at this point in the history

  35. Don't do tests if downloads are off, since they require googletest.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    24eb99d View commit details
    Browse the repository at this point in the history

  36. elalish spotted that this isn't a public header - fix.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    19ed4b8 View commit details
    Browse the repository at this point in the history

  37. Try out CMake intenting based on vim + file footer with settings.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    dcb79ca View commit details
    Browse the repository at this point in the history

  38. Rename sh directory to scripts per suggestion from pca006132

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    334d485 View commit details
    Browse the repository at this point in the history

  39. Per pca006132, remove unnecessary find_package call for oneDPL.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1f60a05 View commit details
    Browse the repository at this point in the history

  40. Simplify MANIFOLD_PAR to an OFF/ON setting 

    Per suggestion from pca006132, changed CMake logic to be ON/OFF, and
simplified the C++ defines to test for defined/undefined vs. checking
for a specific value.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6c9a66e View commit details
    Browse the repository at this point in the history

  41. conv.h is also a private header

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    391c339 View commit details
    Browse the repository at this point in the history

  42. Hmm - looks like flake naming was coming from MANIFOLD_PAR - try tran… 

    …slating the settings.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    54dbd87 View commit details
    Browse the repository at this point in the history

  43. Whoops - need to translate the active value not the cached value.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    ad20572 View commit details
    Browse the repository at this point in the history

  44. OFF is still defined, so make sure we catch that case too

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    8fec63e View commit details
    Browse the repository at this point in the history

  45. Explain multiple calls to get_filename_component

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    384b08b View commit details
    Browse the repository at this point in the history

  46. Move parallel.h to src

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2583f01 View commit details
    Browse the repository at this point in the history

  47. Move iters.h to src

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    aa47594 View commit details
    Browse the repository at this point in the history

  48. Place optional components in subdirectories.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4cc1f67 View commit details
    Browse the repository at this point in the history

  49. Correct path in gen_docs.py

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    5682ed6 View commit details
    Browse the repository at this point in the history

  50. Fix the file location for python bindings.

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0deabaa View commit details
    Browse the repository at this point in the history

  51. Revert "Move iters.h to src" 

    parallel.h was apparently specifically public - undo hiding of iter.h

This reverts commit ce3e45a.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e1bb2b4 View commit details
    Browse the repository at this point in the history

  52. Revert "Move parallel.h to src" 

    parallel.h was apparently specifically public

This reverts commit 08fbcdf.
    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    93158e6 View commit details
    Browse the repository at this point in the history

  53. Footers, indenting adjustments for other CMake files

    @starseeker
    starseeker committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    79bfc42 View commit details
    Browse the repository at this point in the history