Skip to content

Commit

Permalink
Merge pull request #94 from cbritopacheco/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
cbritopacheco authored Dec 15, 2023
2 parents b63d6a8 + f3fd5ae commit dbf9be1
Show file tree
Hide file tree
Showing 88 changed files with 1,956 additions and 1,331 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.x
python-version: 3.12.0
cache: 'pip'
- run: pip install -r doc/requirements.txt
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ option(RODIN_MULTITHREADED "Utilizes multithreading capabalities."

if (RODIN_MULTITHREADED)
set(RODIN_THREAD_SAFE ON CACHE BOOL "" FORCE)
set(Boost_USE_MULTITHREADED ON)
endif()

set(RODIN_RESOURCES_DIR "${PROJECT_SOURCE_DIR}/resources/")
Expand Down Expand Up @@ -95,9 +96,8 @@ if (RODIN_BUILD_SRC)
# set(Boost_USE_STATIC_RUNTIME OFF)

if (RODIN_USE_MPI)
set(Boost_USE_MULTITHREADED ON)
find_package(MPI REQUIRED)
find_package(Boost 1.65 REQUIRED COMPONENTS mpi serialization)
include_directories(${Boost_INCLUDE_DIRS})
endif()

find_package(Boost 1.65 REQUIRED
Expand Down
Loading

0 comments on commit dbf9be1

Please sign in to comment.