Skip to content

Commit

Permalink
Updating to new build system
Browse files Browse the repository at this point in the history
  • Loading branch information
whaeck committed Jul 17, 2021
1 parent 0cb8d83 commit 2283484
Show file tree
Hide file tree
Showing 46 changed files with 235 additions and 3,354 deletions.
24 changes: 0 additions & 24 deletions .gitmodules

This file was deleted.

478 changes: 58 additions & 420 deletions CMakeLists.txt

Large diffs are not rendered by default.

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

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

FetchContent_Declare( Log
GIT_REPOSITORY https://github.com/njoy/Log
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( date-adapter
GIT_REPOSITORY https://github.com/njoy/date-adapter
GIT_TAG origin/master
GIT_SHALLOW TRUE
)

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

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

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

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

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

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

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

FetchContent_MakeAvailable(
Log
catch-adapter
date-adapter
dimwits
disco
interpolation
hana-adapter
header-utilities
range-v3-adapter
)
73 changes: 73 additions & 0 deletions cmake/release_dependencies.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
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( date-adapter
GIT_REPOSITORY https://github.com/njoy/date-adapter
GIT_TAG c929fa53cacb9074b53360cb696c5a669df3723f
)

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

FetchContent_Declare( disco
GIT_REPOSITORY https://github.com/njoy/disco
GIT_TAG a1a7ddb2c0f69465524d8640ee29988b714a881e
)

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

FetchContent_Declare( header-utilities
GIT_REPOSITORY https://github.com/njoy/header-utilities
GIT_TAG cc2610fee15e255c151e8e22aca1e8b3d1a96b39
)

FetchContent_Declare( interpolation
GIT_REPOSITORY https://github.com/njoy/interpolation
GIT_TAG 2a76934a148bf379ab594f6cdd2cdf4c8c28e447 # tag: v0.1.0
)

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
date-adapter
dimwits
disco
hana-adapter
header-utilities
interpolation
Log
range-v3-adapter
spdlog
)
27 changes: 27 additions & 0 deletions cmake/unit_testing.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#######################################################################
# Setup
#######################################################################

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


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

add_subdirectory( src/ACEtk/Table/Data/Parse/test )
add_subdirectory( src/ACEtk/Table/Data/test )
add_subdirectory( src/ACEtk/Table/Header/String/test )
add_subdirectory( src/ACEtk/Table/Header/test )
add_subdirectory( src/ACEtk/Table/test )
add_subdirectory( src/ACEtk/details/verify/CDF/test )
add_subdirectory( src/ACEtk/details/verify/Positive/test )
add_subdirectory( src/ACEtk/details/verify/Sorted/test )
add_subdirectory( src/ACEtk/details/verify/StrictlyPositive/test )
add_subdirectory( src/ACEtk/details/verify/test )
add_subdirectory( src/ACEtk/interpretation/ContinuousEnergyNeutron/test )
add_subdirectory( src/ACEtk/interpretation/DEDX1/test )
add_subdirectory( src/ACEtk/interpretation/EL03/test )
add_subdirectory( src/ACEtk/interpretation/EPR/test )
add_subdirectory( src/ACEtk/interpretation/MP1/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/date-adapter
Submodule date-adapter deleted from a8c8d7
1 change: 0 additions & 1 deletion dependencies/dimwits
Submodule dimwits deleted from d60ddd
1 change: 0 additions & 1 deletion dependencies/disco
Submodule disco deleted from c7d666
1 change: 0 additions & 1 deletion dependencies/header-utilities
Submodule header-utilities deleted from 8d04c1
1 change: 0 additions & 1 deletion dependencies/interpolation
Submodule interpolation deleted from 7e2b95
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 2283484

Please sign in to comment.