From b48d008c3f346af5f9a0bb5db4dd1a5d96697025 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 28 Aug 2020 17:34:44 -0500
Subject: [PATCH] modified: CMakeLists.txt modified:
containers/docker/Dockerfile
---
CMakeLists.txt | 12 ++++++------
containers/docker/Dockerfile | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d92e279..3552868 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
index a11d5c0..2c7426f 100644
--- a/containers/docker/Dockerfile
+++ b/containers/docker/Dockerfile
@@ -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
--
GitLab