Skip to content

Commit 22eb046

Browse files
Merge pull request #14 from KrisThielemans/update_PETSIRD_v0.8.0
Update petsird v0.8.0 and yardl 0.6.5
2 parents 41a4c35 + 4fd989f commit 22eb046

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN mkdir -p /home/vscode/.local/share/CMakeTools \
8787
&& chown vscode:conda /home/vscode/.local/share/CMakeTools/cmake-tools-kits.json
8888

8989
# Install the yardl tool
90-
ARG YARDL_VERSION=0.6.3
90+
ARG YARDL_VERSION=0.6.5
9191
RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
9292
&& tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
9393
&& mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \

cpp/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,15 @@ else()
1616
add_compile_options(-Wall -Wextra -pedantic)
1717
endif()
1818

19-
set(PETSIRD_dir ../PETSIRD/cpp/generated)
20-
add_subdirectory(${PETSIRD_dir} PETSIRD_generated)
19+
set(PETSIRD_dir ../PETSIRD/cpp/)
20+
add_subdirectory(${PETSIRD_dir} PETSIRD)
2121

2222
# Add any packages, below is an example for ROOT (unlikely you'll need that one though!)
2323
# find_package(ROOT REQUIRED COMPONENTS Tree)
2424

2525
# Example lines for a new executable
2626
# add_executable(my_prog my_prog.cpp)
27-
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir})
28-
# needed for helpers
29-
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/..)
30-
# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/../helpers/include)
31-
# target_link_libraries(my_prog PUBLIC petsird_generated)
27+
# target_link_libraries(my_prog PUBLIC petsird_helpers)
3228

3329
# add any dependencies on packages here
3430
# target_link_libraries(my_prog PUBLIC ROOT::Tree)

justfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ default: run
1717
cd cpp/build; \
1818
ninja
1919

20+
@run: build
21+
echo Something here

0 commit comments

Comments
 (0)