Skip to content

Commit

Permalink
Merge pull request #10 from njoy/party
Browse files Browse the repository at this point in the history
Party
  • Loading branch information
jlconlin authored Oct 29, 2020
2 parents e04ed6e + 605c859 commit c113d65
Show file tree
Hide file tree
Showing 42 changed files with 157 additions and 3,078 deletions.
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +0,0 @@
[submodule "dependencies/catch-adapter"]
path = dependencies/catch-adapter
url = https://github.com/njoy/catch-adapter.git
[submodule "dependencies/dimwits"]
path = dependencies/dimwits
url = https://github.com/njoy/DimensionalAnalysis.git
[submodule "dependencies/range-v3-adapter"]
path = dependencies/range-v3-adapter
url = https://github.com/njoy/range-v3-adapter.git
[submodule "dependencies/Log"]
path = dependencies/Log
url = https://github.com/njoy/Log.git
357 changes: 52 additions & 305 deletions CMakeLists.txt

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions cmake/develop_dependencies.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
cmake_minimum_required( VERSION 3.14 )
include( FetchContent )

#######################################################################
# Declare project dependencies
#######################################################################

FetchContent_Declare( range-v3-adapter
GIT_REPOSITORY https://github.com/njoy/range-v3-adapter
GIT_TAG origin/master
GIT_SHALLOW TRUE
)

FetchContent_Declare( catch-adapter
GIT_REPOSITORY https://github.com/njoy/catch-adapter
GIT_TAG origin/master
GIT_SHALLOW TRUE
)

FetchContent_Declare( Log
GIT_REPOSITORY https://github.com/njoy/Log
GIT_TAG origin/master
GIT_SHALLOW TRUE
)

FetchContent_Declare( dimwits
GIT_REPOSITORY https://github.com/njoy/DimensionalAnalysis
GIT_TAG origin/master
GIT_SHALLOW TRUE
)

#######################################################################
# Load dependencies
#######################################################################

FetchContent_MakeAvailable(
range-v3-adapter
catch-adapter
Log
dimwits
)
49 changes: 49 additions & 0 deletions cmake/release_dependencies.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
cmake_minimum_required( VERSION 3.14 )
include( FetchContent )

#######################################################################
# Declare project dependencies
#######################################################################

FetchContent_Declare( catch-adapter
GIT_REPOSITORY https://github.com/njoy/catch-adapter
GIT_TAG fb84b82ebf7a4789aa43cea560680cf745c6ee4f
)

FetchContent_Declare( dimwits
GIT_REPOSITORY https://github.com/njoy/DimensionalAnalysis
GIT_TAG acd794d373c8740a788f5c9d58a6eb8ba4d9861a
)

FetchContent_Declare( hana-adapter
GIT_REPOSITORY https://github.com/njoy/hana-adapter
GIT_TAG f58e8973c9a614dc4f3720b5581a762c61bdbb40
)

FetchContent_Declare( Log
GIT_REPOSITORY https://github.com/njoy/Log
GIT_TAG 52962b7796afe37ef1d8f7edb4bf9ecb1b868d15
)

FetchContent_Declare( range-v3-adapter
GIT_REPOSITORY https://github.com/njoy/range-v3-adapter
GIT_TAG 252679d4737c8f755d87c0e1eed6c37394a2ec59
)

FetchContent_Declare( spdlog
GIT_REPOSITORY https://github.com/gabime/spdlog
GIT_TAG a51b4856377a71f81b6d74b9af459305c4c644f8
)

#######################################################################
# Load dependencies
#######################################################################

FetchContent_MakeAvailable(
catch-adapter
dimwits
hana-adapter
Log
range-v3-adapter
spdlog
)
15 changes: 15 additions & 0 deletions cmake/unit_testing.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#######################################################################
# Setup
#######################################################################

message( STATUS "Adding constants unit testing" )
enable_testing()


#######################################################################
# Unit testing directories
#######################################################################

add_subdirectory( src/constants/CODATA2014/test )
add_subdirectory( src/constants/CODATA2018/test )
add_subdirectory( src/constants/math/test )
1 change: 0 additions & 1 deletion dependencies/Log
Submodule Log deleted from 0bdd88
1 change: 0 additions & 1 deletion dependencies/catch-adapter
Submodule catch-adapter deleted from fb84b8
1 change: 0 additions & 1 deletion dependencies/dimwits
Submodule dimwits deleted from d2b187
1 change: 0 additions & 1 deletion dependencies/range-v3-adapter
Submodule range-v3-adapter deleted from e8b1fb
10 changes: 0 additions & 10 deletions metaconfigure/LICENSE

This file was deleted.

6 changes: 0 additions & 6 deletions metaconfigure/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions metaconfigure/__init__.py

This file was deleted.

Loading

0 comments on commit c113d65

Please sign in to comment.