Skip to content
Snippets Groups Projects
Commit a5546643 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'CI' into 'master'

fixing version of analyzer

See merge request !7
parents 17b4b3a3 b48d008c
No related branches found
No related tags found
1 merge request!7fixing version of analyzer
Pipeline #3786 failed
......@@ -36,15 +36,15 @@ if(HCANA_BUILTIN_PODD)
)
include(PoddCMakeEnv)
else()
set(CMAKE_MODULE_PATH
${PROJECT_SOURCE_DIR}/cmake/Modules
${CMAKE_MODULE_PATH}
)
#set(CMAKE_MODULE_PATH
# ${PROJECT_SOURCE_DIR}/cmake/Modules
# ${CMAKE_MODULE_PATH}
# )
# Find Podd and register it as a dependency
# This will also automatically set up ROOT
find_package(Podd 2.0 REQUIRED)
find_package(Podd 1.8 REQUIRED)
include(PoddCMakeEnv)
config_add_dependency(Podd 2.0)
config_add_dependency(Podd 1.8)
endif()
# Register ROOT dependency - it's in our public interface
......
......@@ -24,7 +24,7 @@ RUN ls -lrth /usr/local/lib/lib*.so \
&& export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH \
&& export PATH=/usr/local/bin:$PATH \
&& git clone https://eicweb.phy.anl.gov/jlab/hallc/analyzer_software/analyzer.git \
&& mkdir analyzer/build && cd analyzer/build && git pull && git checkout master\
&& mkdir analyzer/build && cd analyzer/build && git pull && git checkout v1.8.2 \
&& cmake ../. && make -j20 VERBOSE=1 && make install \
&& cd /tmp && rm -rf analyzer
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment