IAP GITLAB

Skip to content
Snippets Groups Projects
Commit ad04cdad authored by Ralf Ulrich's avatar Ralf Ulrich
Browse files

Merge branch '422-docker-version-doesnt-work-anymore' into 'master'

Resolve "Docker version doesnt work anymore"

Closes #422

See merge request !360
parents 074a2b47 30d083aa
No related branches found
No related tags found
1 merge request!360Resolve "Docker version doesnt work anymore"
Pipeline #4544 canceled
...@@ -109,7 +109,9 @@ message (STATUS "Installing dependencies from Conan (this may take some time)... ...@@ -109,7 +109,9 @@ message (STATUS "Installing dependencies from Conan (this may take some time)...
conan_cmake_run (CONANFILE conanfile.txt conan_cmake_run (CONANFILE conanfile.txt
BASIC_SETUP CMAKE_TARGETS BASIC_SETUP CMAKE_TARGETS
BUILD missing BUILD missing
BUILD_TYPE "Release") BUILD bison
BUILD_TYPE "Release"
SETTINGS compiler.libcxx=libstdc++11)
# #
# add cnpy temporarily. As long as SaveBoostHistogram does not save to parquet directly # add cnpy temporarily. As long as SaveBoostHistogram does not save to parquet directly
# #
......
[requires] [requires]
readline/8.0 # this is only needed to fix a missing dependency in "bison" which is pulled-in by arrow
spdlog/1.8.5 spdlog/1.8.5
catch2/2.13.3 catch2/2.13.3
eigen/3.3.8 eigen/3.3.8
...@@ -9,6 +8,10 @@ proposal/7.0.4 ...@@ -9,6 +8,10 @@ proposal/7.0.4
yaml-cpp/0.6.3 yaml-cpp/0.6.3
arrow/2.0.0 arrow/2.0.0
[build_requires]
readline/8.0 # this is only needed to fix a missing dependency in "bison" which is pulled-in by arrow
bison/[>1.0] # needed for arrow, and we HAVE to compile it
[generators] [generators]
cmake cmake
......
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