Skip to content

Commit 554b2e8

Browse files
Merge pull request #90 from ManuelLerchner/add-library-headers
Fix compilation on CoolMuc
2 parents 2ff4e98 + 6b81658 commit 554b2e8

File tree

7 files changed

+15
-5
lines changed

7 files changed

+15
-5
lines changed

.github/actions/install-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ runs:
88
- name: Install c++ libs
99
run: |
1010
sudo apt install libxerces-c-dev -y
11-
sudo apt install libboost-program-options-dev -y
11+
sudo apt install build-essential libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-test-dev -y
1212
shell: bash

.github/workflows/clang-format.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v2
23+
- uses: ./.github/actions/install-dependencies
2324

2425
- name: Install clang-format
2526
run: |

.github/workflows/deploy-pages.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@v4
22+
- uses: ./.github/actions/install-dependencies
2223

2324
- name: Install dependencies
2425
run: |
2526
sudo apt-get update
2627
sudo apt-get install -y doxygen
2728
sudo apt-get install -y graphviz
28-
sudo apt-get install -y cmake
29+
sudo apt-get install -y cmake
2930
3031
- name: Build docs
3132
run: |

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ endif()
3030
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/)
3131

3232
# project dependencies
33-
include(spdlog)
33+
include(boost_program_options)
3434
include(libxsd)
35+
include(spdlog)
36+
include(xercesc)
3537

3638
# tests and documentation
3739
include(gtest) #provides a BUILD_TESTS option
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Load the Boost libraries
2+
3+
find_package(Boost COMPONENTS program_options REQUIRED)

cmake/modules/xercesc.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Load the XercesC package
2+
3+
find_package(XercesC 3.2.0 REQUIRED)

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ list(REMOVE_ITEM PROJECT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/MolSim.cpp")
99
add_library(project_lib ${PROJECT_SRC}
1010
simulation/SimulationParams.cpp)
1111

12-
target_include_directories(project_lib PUBLIC
12+
target_include_directories(project_lib PUBLIC
1313
${libxsd_SOURCE_DIR}
1414
${spdlog_SOURCE_DIR}/include)
1515

16-
target_link_libraries(project_lib PUBLIC xerces-c boost_program_options spdlog::spdlog)
16+
target_link_libraries(project_lib PUBLIC XercesC::XercesC spdlog::spdlog Boost::program_options)
1717

1818
add_executable(MolSim MolSim.cpp)
1919
target_link_libraries(MolSim PUBLIC project_lib)

0 commit comments

Comments
 (0)