Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Massive Set of Changes #22

Merged
merged 51 commits into from
Apr 4, 2023
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6c7dbd3
missed some references to boost::split
Mar 6, 2023
d457132
Merge branch 'larryk85/proj-changes' of github.com:antelopeio/antler-…
Mar 6, 2023
71f33fa
More changes
Mar 11, 2023
56583e4
changes
Mar 13, 2023
76b9e6f
more updates
Mar 14, 2023
c155b78
more changes and tests
Mar 16, 2023
242396a
back to parity
Mar 16, 2023
d37ec68
fuzz
Mar 16, 2023
6c7b293
fixes for gcc9
Mar 17, 2023
feec6a8
forgot cpps
Mar 17, 2023
4e3c89b
forgot one last reference
Mar 17, 2023
d0376d5
hopefully the last filesystem references
Mar 17, 2023
0b372f3
fix
Mar 17, 2023
f9f555e
fix
Mar 17, 2023
1252dbf
more changes
Mar 21, 2023
fc07dc2
more issues with ubuntu18
Mar 21, 2023
c6f9af7
rollback cmake
Mar 21, 2023
69f0c01
fix deps
Mar 21, 2023
96b20c9
update deps
Mar 21, 2023
c47a0db
update deps
Mar 21, 2023
263dffc
update deps
Mar 21, 2023
8a59e2f
update deps
Mar 21, 2023
9d6adbd
more more updates
Mar 22, 2023
cc2cf14
fix constraints
Mar 22, 2023
b42219e
fix populate
Mar 22, 2023
75dcffd
update gitignore
Mar 22, 2023
6dc9b1c
update logger
Mar 22, 2023
038d203
small fixes for cdt installation
Mar 24, 2023
1afe6e5
renable licensefile, small cleanup
ScottBailey Mar 31, 2023
3874966
Remove unused option: ANTLER_PROJ_PEDANTIC_BUILD
ScottBailey Mar 31, 2023
1e42809
Add [[nodiscard]]
ScottBailey Mar 31, 2023
55f8937
Correct description for jobs.
ScottBailey Mar 31, 2023
213c572
Remove commented out code.
ScottBailey Mar 31, 2023
03260ee
warning removal
ScottBailey Mar 31, 2023
866aa28
comment for disabled code
ScottBailey Mar 31, 2023
ca9f4b2
adding TODO comments.
ScottBailey Apr 3, 2023
c1f0127
Addressing review comment, whitespace
ScottBailey Apr 3, 2023
22e0e0f
Reenable tests and check return result to satisfy nodiscard decorations.
ScottBailey Apr 3, 2023
ab2fd78
Removed unused test.
ScottBailey Apr 3, 2023
019fcda
Adding TODO comment.
ScottBailey Apr 3, 2023
f17b961
Correct arguments and calls.
ScottBailey Apr 3, 2023
6ce0391
Address review comment.
ScottBailey Apr 3, 2023
09a7323
Address review comment.
ScottBailey Apr 3, 2023
17da588
Correct defect in logging.
ScottBailey Apr 3, 2023
1e8097e
Review comment.
ScottBailey Apr 3, 2023
5b44f00
Address review comment. Remove incorrect comment.
ScottBailey Apr 3, 2023
8c9b5c7
Small clarification in docs.
ScottBailey Apr 3, 2023
dd80a4b
allow tests to run in parallel
dimas1185 Apr 4, 2023
fa8ad98
Merge main
ScottBailey Apr 4, 2023
1850593
missed some references to boost::split
Apr 4, 2023
04e3b89
small fixes for location
Apr 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
[Bb]uild*/*
CMakeLists.txt.user
*.md.backup
*.md.backup

settings.json
checks.json

tests/Testing/*

.vscode/*

tools/tests/__pycache__/*
18 changes: 12 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
[submodule "external/rapidyaml"]
path = external/rapidyaml
url = https://github.com/biojppm/rapidyaml
[submodule "external/magic_enum"]
path = external/magic_enum
url = https://github.com/Neargye/magic_enum
[submodule "external/Catch2"]
path = external/Catch2
url = https://github.com/catchorg/Catch2
[submodule "external/nlohmann"]
path = external/nlohmann
url = https://github.com/nlohmann/json
[submodule "external/yaml-cpp"]
path = external/yaml-cpp
url = https://github.com/jbeder/yaml-cpp
[submodule "external/cturtle"]
path = external/cturtle
url = https://github.com/larryk85/cturtle
[submodule "external/Mustache"]
path = external/Mustache
url = https://github.com/kainjow/Mustache
[submodule "external/fmt"]
path = external/fmt
url = https://github.com/fmtlib/fmt
24 changes: 15 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,39 @@
# @copyright See `LICENSE` in the root directory of this project.

cmake_minimum_required(VERSION 3.11) # If ryml >= 0.5.0 is included via FetchContent or submodule, this minimum is 3.12.
cmake_minimum_required(VERSION 3.10)

project("ANTLER Project Tools " VERSION 1.0.0)

include( ./common.cmake REQUIRED )



option(ANTLER_PROJ_BUILD_TESTS "Build and run the tests." On)
option(ANTLER_PROJ_TIDY_CHECKS "Uses clang-tidy in building." On)

add_subdirectory( external )
add_subdirectory( include )
add_subdirectory( src )
add_subdirectory( tools )


option(PEDANTIC_BUILD "Pedantic builds" On)
option(BUILD_TESTS "Build and run the tests." On)

if(BUILD_TESTS)
if(ANTLER_PROJ_BUILD_TESTS)
enable_testing()
add_subdirectory( tests )
endif()

# Clang-tidy support
if (ANTLER_PROJ_TIDY_CHECKS)
find_program(CLANG_TIDY_EXE NAMES "clang-tidy" REQUIRED)
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "-checks=*,modernize-*")
endif()

# Copy licenses to BUILD dir
#
# NOTE: This is used due to legacy requirements instead of:
# `install(FILE <license files> COMPONENT Documentation DESTINATION share/aproj/licenses)`
configure_file(LICENSE ${CMAKE_BINARY_DIR}/licenses/LICENSE COPYONLY)
configure_file(LICENSE licenses/LICENSE COPYONLY)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I may change this back in cdt/#112 if submoduling won't work with this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, you might need to change it to something different. The replacement line and original should be functionally the same.

file(GLOB license_files licenses/*)
foreach(full_path IN ITEMS ${license_files})
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" file_name ${full_path})
configure_file("${file_name}" "${CMAKE_BINARY_DIR}/${file_name}" COPYONLY)
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" file_name ${full_path})
configure_file("${full_path}" "${file_name}" COPYONLY)
endforeach()
23 changes: 16 additions & 7 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
add_subdirectory(rapidyaml)

set(MAGIC_ENUM_OPT_BUILD_EXAMPLES OFF CACHE BOOL "Skip magic_enum examples")
set(MAGIC_ENUM_OPT_BUILD_TESTS OFF CACHE BOOL "Skip magic_enum tests")
set(MAGIC_ENUM_OPT_INSTALL OFF CACHE BOOL "Skip magic_enum install")
add_subdirectory(magic_enum)

set(CATCH_INSTALL_DOCS OFF CACHE BOOL "Skip install docs")
set(CATCH_INSTALL_EXTRAS OFF CACHE BOOL "Skip install extras")
set(CATCH_BUILD_TESTING OFF CACHE BOOL "Skip build testing")
Expand All @@ -15,3 +8,19 @@ include(Catch)
set(JSON_BuildTests OFF CACHE INTERNAL "Skip json tests")
set(JSON_Install OFF CACHE INTERNAL "Skip json install")
add_subdirectory(nlohmann)

set(YAML_CPP_BUILD_CONTRIB OFF CACHE INTERNAL "Skip yaml-cpp contrib")
set(YAML_CPP_BUILD_TOOLS OFF CACHE INTERNAL "Skip yaml-cpp tools")
set(YAML_BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build yaml-cpp static libs")
set(YAML_CPP_INSTALL OFF CACHE INTERNAL "Skip yaml-cpp install")
set(YAML_CPP_FORMAT_SOURCE OFF CACHE INTERNAL "Skip yaml-cpp format source")
add_subdirectory(yaml-cpp)

set(FMT_INSTALL OFF CACHE INTERNAL "Skip fmt install")
add_subdirectory(fmt)

set(CTURTLE_ENABLE_TESTS OFF CACHE INTERNAL "Skip cturtle tests")
set(CTURTLE_ENABLE_INSTALL OFF CACHE INTERNAL "Skip cturtle install")
add_subdirectory(cturtle)

add_subdirectory(Mustache)
1 change: 1 addition & 0 deletions external/Mustache
Submodule Mustache added at 04277d
1 change: 1 addition & 0 deletions external/cturtle
Submodule cturtle added at 2c3e6d
1 change: 1 addition & 0 deletions external/fmt
Submodule fmt added at 6002dd
1 change: 0 additions & 1 deletion external/magic_enum
Submodule magic_enum deleted from 654240
1 change: 0 additions & 1 deletion external/rapidyaml
Submodule rapidyaml deleted from 7c0036
1 change: 1 addition & 0 deletions external/yaml-cpp
Submodule yaml-cpp added at 987a60
Loading