Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/context #207

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions .github/workflows/test_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build, Test, and Publish
on:
pull_request:
push:
branches: [main, develop]
branches: [main, develop, feature/context]
tags: ['*']
workflow_dispatch:

Expand Down Expand Up @@ -137,4 +137,4 @@ jobs:
- name: Release
uses: softprops/action-gh-release@v1
if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}


8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ if (Katydid_USE_MANTIS)
link_directories (${Mantis_LIBRARY_DIRS})
pbuilder_add_ext_libraries (${Mantis_LIBRARIES})
add_definitions (-DUSE_MANTIS)
set (Mantis_FOUND TRUE)
set_option (Mantis_FOUND TRUE)
endif (Katydid_USE_MANTIS)

# Boost (1.46 required for filesystem version 3)
Expand Down Expand Up @@ -111,6 +111,7 @@ if (Katydid_USE_PYTHON)
SET( Nymph_ENABLE_PYTHON ON CACHE BOOL "" FORCE)
else (Katydid_USE_PYTHON)
set( Nymph_ENABLE_PYTHON OFF CACHE BOOL "" FORCE)
set_option (Katydid_USE_PYTHON FALSE)
endif (Katydid_USE_PYTHON)

# FFTW
Expand All @@ -134,6 +135,7 @@ else (FFTW_FOUND)
remove_definitions(-DFFTW_FOUND)
remove_definitions (-DFFTW_NTHREADS=${FFTW_NTHREADS})
set (FFTW_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/External/FFTW)
set_option (Katydid_USE_FFTW FALSE)
endif (FFTW_FOUND)
include_directories (${FFTW_INCLUDE_DIR})

Expand All @@ -150,6 +152,7 @@ if (HDF5_FOUND)
else (HDF5_FOUND)
#remove_definitions (-DHDF5_FOUND)
message (STATUS "Building without HDF5")
set_option (Katydid_USE_HDF5 FALSE)
endif (HDF5_FOUND)

# ROOT
Expand All @@ -165,6 +168,7 @@ if (ROOT_FOUND)
else (ROOT_FOUND)
message(STATUS "Building without ROOT")
remove_definitions(-DROOT_FOUND)
set_option (Katydid_USE_ROOT FALSE)
endif (ROOT_FOUND)
include_directories (${ROOT_INCLUDE_DIR})

Expand All @@ -181,6 +185,7 @@ if (MATIO_FOUND)
else (MATIO_FOUND)
message (STATUS "Building without Matlab")
remove_definitions(-DUSE_MATLAB)
set_option (Katydid_USE_MATLAB FALSE)
endif (MATIO_FOUND)

# GraphicsMagic & Magick++
Expand All @@ -207,6 +212,7 @@ if (DLIB_FOUND)
else (DLIB_FOUND)
message (STATUS "Building without DLIB")
remove_definitions(-DUSE_DLIB)
set_option (Katydid_USE_DLIB FALSE)
endif (DLIB_FOUND)

# OpenMP
Expand Down
2 changes: 1 addition & 1 deletion Cicada
Loading