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

Commit

Permalink
Merge pull request #9 from AntelopeIO/larryk85/proj-changes
Browse files Browse the repository at this point in the history
Antler project changes
  • Loading branch information
ScottBailey authored Mar 13, 2023
2 parents cc5f9f8 + 16512c3 commit fc772a7
Show file tree
Hide file tree
Showing 91 changed files with 2,559 additions and 39,027 deletions.
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[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
25 changes: 8 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,22 @@

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

project("ANTLER Project Tools ")
project("ANTLER Project Tools " VERSION 1.0.0)

include( ./common.cmake REQUIRED )

if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "11")
message(FATAL_ERROR "Insufficient clang version")
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
message(FATAL_ERROR "Insufficient gcc version")
endif()
else()
message(WARNING "This build requires a C++20 compliant compiler.")
endif()


add_subdirectory( project )
add_subdirectory( aproj )
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)
enable_testing()
add_subdirectory( test )
add_subdirectory( tests )
endif()


Expand Down
38 changes: 0 additions & 38 deletions aproj/CMakeLists.txt

This file was deleted.

89 changes: 0 additions & 89 deletions aproj/aproj-add-app.cpp

This file was deleted.

155 changes: 0 additions & 155 deletions aproj/aproj-add-dep.cpp

This file was deleted.

Loading

0 comments on commit fc772a7

Please sign in to comment.