Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ContinuousIntegration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
name: Continuous Integration

# This workflow is triggered on pushes and pull requests to the repository.
on:
on:
push:
branches: '**'
pull_request:
pull_request:
branches: 'master'

jobs:
build:
runs-on: ${{matrix.os}}
strategy:
matrix:
os: [ ubuntu-18.04, macos-10.15 ]
os: [ ubuntu-20.04, macos-11 ]
cxx: [ g++-9, clang++ ]
build_type: [ Debug, Release ]

steps:
- name: which CXX
run: |
which ${{matrix.cxx}}
which ${{matrix.cxx}}
${{matrix.cxx}} --version
- uses: actions/checkout@v2
- name: mkdir bin
run: mkdir bin
run: mkdir bin
- name: cmake
run: cmake -D CMAKE_CXX_COMPILER=`which ${{matrix.cxx}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..
run: cmake -D CMAKE_CXX_COMPILER=`which ${{matrix.cxx}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..
working-directory: ./bin
- name: make
run: make -j2
Expand Down
42 changes: 41 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
subprojects
# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

bin
build
subprojects
dependencies

# emacs
*~
\#*\#
.\#*

# python
__pycache__
*.pyc
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ add_library( dimwits INTERFACE
target_include_directories( dimwits INTERFACE src/ )
target_link_libraries( dimwits
INTERFACE catch-adapter
INTERFACE hana-adapter
INTERFACE hana
)


Expand All @@ -69,6 +69,9 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

# unit testing
if( dimwits_unit_tests )
configure_file( cmake/unit_testing_ignore.cmake
"${PROJECT_BINARY_DIR}/CTestCustom.cmake"
COPYONLY )
include( cmake/unit_testing.cmake )
endif()

Expand Down
8 changes: 4 additions & 4 deletions cmake/develop_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ FetchContent_Declare( catch-adapter
GIT_SHALLOW TRUE
)

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

Expand All @@ -23,5 +23,5 @@ FetchContent_Declare( hana-adapter

FetchContent_MakeAvailable(
catch-adapter
hana-adapter
hana
)
12 changes: 6 additions & 6 deletions cmake/release_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ include( FetchContent )
# Declare project dependencies
#######################################################################

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

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

FetchContent_Declare( hana
GIT_REPOSITORY https://github.com/boostorg/hana
GIT_TAG 5c28aad03b6e157452d8623802d70dc95a7b57b6 # tag: boost-1.77.0
)

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

FetchContent_MakeAvailable(
hana-adapter
catch-adapter
hana
)
Loading