Skip to content

Commit

Permalink
Add missing shell specification for mamba installation of doxygen
Browse files Browse the repository at this point in the history
Fix installation of docs in nested directory
Add installation of docs to run script
  • Loading branch information
langmm committed Jan 10, 2024
1 parent f837c7e commit 891dc1a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,12 @@ jobs:
use-mamba: true
- name: Install doxgen on unix systems
if: matrix.os != 'windows-latest' && matrix.python-install == 'conda'
shell: bash -l {0}
run: |
mamba install doxygen>=1.9.2 graphviz -y
- name: Install LLVM on mac for OpenMP
if: matrix.os == 'macos-latest' && matrix.python-install == 'conda'
# shell: bash -l {0}
run: |
mamba install llvm -y
- name: Install compilers using conda on Linux/Mac
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ if(YGG_BUILD_DOCS)
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
VERBATIM)
install(DIRECTORY ${DOXYGEN_BUILD_DIR}
install(DIRECTORY ${DOXYGEN_BUILD_DIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/ygginterrfacecpp
OPTIONAL)
endif()
Expand Down
7 changes: 2 additions & 5 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ while [[ $# -gt 0 ]]; do
DO_DOCS="TRUE"
DONT_TEST="TRUE"
DONT_BUILD="TRUE"
# BUILD_FLAGS="${BUILD_FLAGS} --target docs"
# CMAKE_FLAGS="${CMAKE_FLAGS} -DYGG_BUILD_DOCS=ON"
shift
;;
--speed )
Expand Down Expand Up @@ -386,9 +384,8 @@ if [ -n "$DO_DOCS" ] && [ -x "$path_to_doxygen" ]; then
fi
cd build
cmake .. $CMAKE_FLAGS -DYGG_BUILD_DOCS=ON -DBUILD_CPP_LIBRARY=OFF -DBUILD_FORTRAN_LIBRARY=OFF
cmake --build . --target docs
# cmake --build . $CONFIG_FLAGS --target docs
cmake --build . $CONFIG_FLAGS --target docs
# Need install here to ensure that cmake config files are in place
# cmake --install . --prefix "$INSTALL_DIR" $CONFIG_FLAGS
cmake --install . --prefix "$INSTALL_DIR" $CONFIG_FLAGS
cd ..
fi

0 comments on commit 891dc1a

Please sign in to comment.