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

Refactor the project layout #18

Merged
merged 95 commits into from
May 23, 2024
Merged

Refactor the project layout #18

merged 95 commits into from
May 23, 2024

Conversation

balazsdukai
Copy link
Member

@balazsdukai balazsdukai commented May 4, 2024 •
edited
Loading

Implements my proposal from #16 :

  • Use vcpkg for most of the libraries. Vcpkg is not a git submodule, because it's super heavy. Currently everyone needs to set it up on their own. There are two options for using vcpkg:
    • Use the build preset with --preset build and set the VCPKG_ROOT environment variable.
    • Set the CMAKE_TOOLCHAIN_FILE cmake variable directly.
  • Use CPM for libraries that are not on vcpkg (val3dity, rerun)
  • Restructure src into libraries
  • Remove the umbrella roofer lib and link to the required libraries in the apps. This shouldn't cause any problems, right @Ylannl ?
  • Clean up a bit and reformat the cmakelists

Fixes #16

@balazsdukai balazsdukai requested a review from Ylannl May 4, 2024 22:09
@balazsdukai balazsdukai mentioned this pull request May 4, 2024
Open
37 tasks
balazsdukai and others added 25 commits May 6, 2024 10:04
@balazsdukai
Remove vcpkg include
0e7eb0f 
Use CMAKE_TOOLCHAIN_FILE or CMakeUserPresets.json instead
@balazsdukai
Matrix build with vcpkg binary caching
ba0af79 
Binary caching is working, but the cmake build does not succeed on any of the OS-es for various reasons.
One of the reasons is that we need to use newer compilers that support the c++20 features that we are using (eg. format).
@balazsdukai
Find macOS and compiler versions
196b5b8
@balazsdukai
compiler versions
5465c59
@balazsdukai
compiler versions
ccb3cf1
@balazsdukai
use ninja
867c726
@balazsdukai
use ninja
6af4307
@balazsdukai
use ninja
62a70d3
@balazsdukai
try fix erors
d3c9ea9
@balazsdukai
ldd
5c7a160
@balazsdukai
try ubuntu 24 with errors
a4d1605
@balazsdukai
try ubuntu 24 with errors
d5672c6
@Ylannl
CI: macos fix
8b58889
@Ylannl
logger.h: add cstdint header
a980544
@Ylannl
CI: install vcpkg on macos-14
d5b247d
@Ylannl
CI: fix issue with macos-14 vcpkg PATH
d1367d4
@Ylannl
disable ubuntu builds
e4fde7f
@Ylannl
CI: fix build type for macos
744fd4a
@Ylannl
CI: add verbose flag to cmake --build
ae99d26
@Ylannl
cmake: add options USE_RERUN|VAL3DITY, BUILD_APPS
91d3656
@Ylannl
expose USE_* options as defines
d8d45ce
@balazsdukai
Switch to default compilers
61d74eb
@Ylannl
CI: add windows specific commands
3ca9d67
@Ylannl
CI: fix yaml error
4f3971f
@balazsdukai
Switch std::format to fmt
3e9c88a
@balazsdukai balazsdukai force-pushed the feature/project-tools-refactor branch from c5a844a to 5e671c1 Compare May 21, 2024 00:53
@balazsdukai balazsdukai force-pushed the feature/project-tools-refactor branch from 10cef3f to ee71a53 Compare May 21, 2024 21:36
Ylannl and others added 23 commits May 22, 2024 13:31
@Ylannl
set X_VCPKG_APPLOCAL_DEPS_INSTALL for WIN32
7a43ba7
@Ylannl
fix vmacos typo
b73eccd
@Ylannl
define platform specific cmake presets for CI
aab8177
@Ylannl
define cmake buildPresets for CI
0273037
@Ylannl
define cmake buildPresets for CI
28f0e74
@balazsdukai
Document test data; Upload reconstruct test data
850218d
@Ylannl
install proj+gdal data dirs on windows
ed243c9
@Ylannl
try bash shell for windows install test
26d88ca
@Ylannl
try bash shell for windows install test
996fb63
@Ylannl
CI: set PATH differently for windows
c7c99e8
@Ylannl
CI: set PATH differently for windows
0760318
@balazsdukai
Run pytest directly with invalid config
c5df94d 
Because I suspect that the failures are not picked up by CTest
@Ylannl
CI: windows wip
2e8a114
@Ylannl
Merge branch 'feature/project-tools-refactor' of https://github.com/3…
aa14769 
…DGI/roofer-dev into feature/project-tools-refactor
@balazsdukai
Add tools descriptions to README-dev.md
0b00691
@balazsdukai
Merge remote-tracking branch 'origin/feature/project-tools-refactor' …
5d4a3fd 
…into feature/project-tools-refactor
@balazsdukai
Remove invalid config test
7b3320b
@Ylannl
fix build on gilfoyle
ed332d4
@Ylannl
only set PROJ/GDAL data when using vcpkg
5a7e40b
@Ylannl
Merge branch 'develop' into feature/project-tools-refactor
745f94c
@balazsdukai
Only run CI on a PR to develop
3c6d046
@balazsdukai
Add compile instructions
1d22e2e
@balazsdukai
Merge remote-tracking branch 'origin/feature/project-tools-refactor' …
5805bf9 
…into feature/project-tools-refactor

# Conflicts:
#	README.md
@Ylannl Ylannl merged commit 94547c6 into develop May 23, 2024
7 of 8 checks passed
@Ylannl Ylannl deleted the feature/project-tools-refactor branch May 23, 2024 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ylannl Ylannl Awaiting requested review from Ylannl

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor the project layout
2 participants
@balazsdukai @Ylannl