Commit c9022ab8 authored by Edwin Carlinet's avatar Edwin Carlinet
Browse files

Hot fix for building dev on gitlab.

Deactivate benchmark option on this branch. They were not build anyway.
parent 51d18cf3
Pipeline #12532 failed with stages
in 23 seconds
......@@ -10,7 +10,7 @@ image: carlinet/buildimage
stage: test
script:
- mkdir build && cd build
- cmake .. -DCMAKE_BUILD_TYPE=$PYLENE_CONFIGURATION
- cmake .. -DCMAKE_BUILD_TYPE=$PYLENE_CONFIGURATION -DPYLENE_BUILD_BENCHMARKS=OFF
- cmake --build . --target check
......@@ -46,7 +46,7 @@ build-doc-images:
stage: build
script:
- mkdir build && cd build
- cmake .. -DCMAKE_BUILD_TYPE=Release
- cmake .. -DCMAKE_BUILD_TYPE=Release -DPYLENE_BUILD_BENCHMARKS=OFF
- cmake --build . --target build-images
artifacts:
paths:
......
......@@ -11,6 +11,7 @@ find_package(Qt4)
# CONFIGURATION OPTIONS
set(MLN_USE_TBB YES CACHE BOOL "Set to NO to disable use of TBB and parallelization")
option(PYLENE_BUILD_BENCHMARKS "Require Google Benchmark library. Set to YES to enable the compilation of benchmarks." YES)
# Proper project creation
set(MLN_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
......@@ -88,6 +89,10 @@ add_definitions(-D BOOST_PP_VARIADICS=1)
# Subdirectories
add_subdirectory(doc EXCLUDE_FROM_ALL)
add_subdirectory(tests EXCLUDE_FROM_ALL)
if (PYLENE_BUILD_BENCHMARKS)
add_subdirectory(bench EXCLUDE_FROM_ALL)
endif()
add_subdirectory(bench EXCLUDE_FROM_ALL)
add_subdirectory(apps EXCLUDE_FROM_ALL)
add_subdirectory(cli EXCLUDE_FROM_ALL)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment