Skip to content

Commit

Permalink
add NO_BUILD and a preset only to build documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
YanzhaoW committed Jan 10, 2025
1 parent 5bfea69 commit caf2420
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
4 changes: 0 additions & 4 deletions .github/actions/pre-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ runs:
run: |
apt-get update
apt-get install --fix-missing -y ccache sudo
<<<<<<< HEAD
conda install -y conda-forge::ninja
=======
>>>>>>> d4adb981 (Find ROOT using config mode and cmake targets)
wget https://cernbox.cern.ch/remote.php/dav/public-files/RmnTeeOZpYjCJQb/masterkey.gsi.de.pub
mv masterkey.gsi.de.pub /etc/cvmfs/keys
cp .github/config/fairsoft.gsi.de.conf /etc/cvmfs/config.d
Expand Down
4 changes: 0 additions & 4 deletions .github/actions/r3bbuild-steps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ runs:
echo ""
echo "path environment variable: $PATH\n"
echo ""
<<<<<<< HEAD
cmake --preset ${{ matrix.preset }} . -C "$GITHUB_WORKSPACE/cmake/CI_CD/configure_options.cmake"
=======
./build.py -p -c --cmake-extra-args="-DBUILD_GEOMETRY=OFF;-C $GITHUB_WORKSPACE/cmake/CI_CD/configure_options.cmake"
>>>>>>> 3a7c47f7 (Conan package manager, build.py and Neuland calibration rewrite)
shell: bash

- name: build ${{ matrix.repos }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: deploy-container

on:
push:
branches: [ neuland_new_calibration ]
# branches: [ neuland_new_calibration ]
workflow_dispatch:


Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/publish_doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ jobs:
- name: run doxygen
run: |
brew upgrade
brew install doxygen graphviz cmake ninja npm
brew install doxygen graphviz cmake ninja npm gcc
export PATH="/opt/homebrew/bin:$PATH"
echo "brew home: ${HOMEBREW_PREFIX}"
which gcc
ls ${HOMEBREW_PREFIX}/bin
which gfortran
npm install mathjax@3
cmake --workflow --preset doxygen
Expand Down
16 changes: 11 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ project(R3BROOT LANGUAGES C CXX Fortran)
# use default gnu install convention:
include(GNUInstallDirs)

option(WITH_DOX "Generate doxygen documentation" OFF)
option(NO_BUILD "Don't build anything except documentation" OFF)

if(WITH_DOX)
add_subdirectory(doc)
endif()

if(NO_BUILD)
return()
endif()

if(NOT EXISTS "${PROJECT_SOURCE_DIR}/macros")
message(STATUS " ")
message(
Expand Down Expand Up @@ -92,7 +103,6 @@ option(WITH_ACTAR "Build ACTAR" OFF)
option(WITH_SOFIA "Build SOFIA" OFF)
option(WITH_GTPC "Build GTPC" OFF)
option(WITH_FRS "Build FRS" OFF)
option(WITH_DOX "Generate doxygen documentation" OFF)
option(WITH_ASYEOS "Build ASYEOS" OFF)
option(BUILD_C3W "Build C3W" OFF)
option(CONAN_ENABLED "conan package is enabled. (Use CMakePreset to set it)" OFF)
Expand Down Expand Up @@ -568,10 +578,6 @@ if(MODULE)
add_subdirectory(${MODULE})
endif(MODULE)

if(WITH_DOX)
add_subdirectory(doc)
endif()

if(NOT MODULE)
if(BUILD_GEOMETRY)
set(ROOTSYS ${SIMPATH})
Expand Down
7 changes: 2 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,9 @@
"description": "Only build the doxygen documentation",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": "OFF",
"BUILD_GEOMETRY": "OFF",
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "util/cmake-conan/conan_provider.cmake",
"CONAN_ENABLED": "YES",
"WITH_DOX": "ON"
"WITH_DOX": "ON",
"NO_BUILD": "ON"
}
}
],
Expand Down

0 comments on commit caf2420

Please sign in to comment.