Skip to content
Snippets Groups Projects
Commit 916a6303 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

[j.1] rm Pyenv from CI-script (partly reverting previous MR) because of versiondocs ()

Merging branch 'j.1'  into 'main'.

See merge request !2502
parents 3f254c58 737892b1
No related branches found
No related tags found
1 merge request!2502rm Pyenv from CI-script (partly reverting previous MR) because of versiondocs
Pipeline #139175 passed
......@@ -12,9 +12,6 @@ native_Debian:
- pwd
- export CC=gcc; export CXX=g++
- export MPLBACKEND=Agg
- pyenv version
- export PATH="$HOME/.pyenv/bin:$PATH"
- eval "$(pyenv init -)"
- cmake --version
stage: build
script: &native_scr
......@@ -44,9 +41,9 @@ versiondocs:
- hugo version
- mkdir build
- cd build
- time cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBATCH_MODE=ON
- time make -j8
- time make -j8 webdoc
- time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_GUI=OFF
- time ninja -j8
- time ninja -j8 webdoc
- rm -rf ~www/ba/git-main/hugo-public
- cp -r ../hugo/public ~www/ba/git-main/hugo-public
......
......@@ -48,7 +48,6 @@ option(DEV "Development: turns ALLCONFIG, ZERO_TOLERANCE, DEVELOPER_CHECKS on" O
option(BA_COVERAGE "Build with test coverage information" OFF)
option(BA_DEBUG_OPTIMIZATION "Build with debug optimization (gcc only)" OFF)
option(BA_TIDY "Invokes clang-tidy" OFF)
option(BATCH_MODE "Suppress some output" OFF)
option(ALGORITHM_DIAGNOSTIC "Let some algorithms set diagnostic variables" OFF)
option(BA_APPLE_BUNDLE "Create a MacOS bundle" OFF)
option(BA_CPP_API "Install header files" OFF)
......@@ -70,9 +69,6 @@ if(ALLCONFIG)
set(CONFIGURE_EXAMPLES ON)
set(CONFIGURE_DOXY ON)
endif()
if(BATCH_MODE)
set(BA_GUI OFF)
endif()
# check compatibility of options
......
......@@ -13,9 +13,6 @@ file(GLOB include_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */*.h)
# --- make the library ---
add_library(${lib} SHARED)
if(BATCH_MODE)
target_compile_definitions(${lib} PRIVATE SILENT_PROGRESS=ON)
endif()
MakeLib(${lib} "${CMAKE_CURRENT_BINARY_DIR}/Wrap" "${source_files}" "${include_files}")
# --- external dependences ---
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment