diff --git a/.gitignore b/.gitignore index f1f75b1fc3d756d3974b5ee6199c4c6bd7bbcb61..1468039e79aa1df8b14b00fa694628831154a761 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ build doxygen *.dylib *.so +/RooUnfoldConfig.cmake # python *.egg-info diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c72a32ef2a86de1c2c4aed6e2f6a716732a3739..133c82788795476d283d2898cff840df28dae808 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,10 @@ stages: .doxygen: &doxygen stage: doc - image: rootproject/root-ubuntu16 + image: rootproject/root before_script: - - sudo apt-get update - - sudo apt-get install -y doxygen texlive-font-utils + - apt-get update + - apt-get install -y doxygen texlive-font-utils .atlas: &atlas image: atlas/analysisbase:21.2.64 @@ -29,7 +29,7 @@ stages: - source /home/atlas/release_setup.sh .standalone: &standalone - image: rootproject/root-ubuntu16 + image: rootproject/root .ctest: &ctest stage: test @@ -103,8 +103,8 @@ stages: .dAgostini: &dAgostini <<: *standalone before_script: - - sudo apt-get update - - sudo apt-get install wget + - apt-get update + - apt-get install wget - export FC=gfortran - bash get_dagos_bayes.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c2ba910f3c5ad5ce55dba57e8e38bc6e9581b97..4e2f78205e40b71c53779f77f00443473d094ab8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(RooUnfold) if (${RunningAtlasCI}) - message("Setup for CI in ATLAS analysis release") + message("-- Setup for CI in ATLAS analysis release") include (CMakeLists_forAtlasCI.txt) endif() @@ -46,7 +46,7 @@ if(EXISTS ${RooUnfoldDagostini}) set (CMAKE_Fortran_FLAGS "-funroll-all-loops -fno-f2c -O3 -std=f95 -fimplicit-none -m32") endif() else() - message("disabling d'Agostini implementation") + message("-- Disabling d'Agostini implementation") file(GLOB RooUnfoldDagostini src/RooUnfoldDagostini.*) list(REMOVE_ITEM RooUnfoldHeaders ${RooUnfoldDagostini}) list(REMOVE_ITEM RooUnfoldSources ${RooUnfoldDagostini}) @@ -166,28 +166,30 @@ foreach(TestScript ${Tests}) endforeach() # first we can indicate the documentation build as an option and set it to ON by default -option(BUILD_DOC "Build documentation" ON) +option(BUILD_DOC "Build documentation" OFF) # check if Doxygen is installed -find_package(Doxygen) -if (DOXYGEN_FOUND) +if (BUILD_DOC) + find_package(Doxygen) + if (DOXYGEN_FOUND) # set input and output files set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake) set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) # request to configure the file configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY) - message("Doxygen build started") + message("-- Doxygen build started") # note the option ALL which allows to build the docs together with the application add_custom_target( doxygen ALL - COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating API documentation with Doxygen" - VERBATIM ) -else (DOXYGEN_FOUND) - message("Doxygen need to be installed to generate the doxygen documentation") -endif (DOXYGEN_FOUND) + COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating API documentation with Doxygen" + VERBATIM ) + else (DOXYGEN_FOUND) + message("-- Doxygen needs to be installed to generate the doxygen documentation") + endif (DOXYGEN_FOUND) +endif (BUILD_DOC) if (SKBUILD) # install the compiled python module in src/RooUnfold to be picked up by the python wheels setup