Fixed docker logic.

laristra · Apr 4, 2018 · 5692890 · 5692890
1 parent 8424dfa
commit 5692890
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/config/project.cmake b/config/project.cmake
@@ -194,6 +194,10 @@ if(ENABLE_OPENSSL)
   endif()
 endif()
 
+if(ENABLE_CALIPER)
+  list(APPEND FLECSI_LIBRARY_DEPENDENCIES ${Caliper_LIBRARIES})
+endif()
+
 #------------------------------------------------------------------------------#
 # Runtime models
 #------------------------------------------------------------------------------#

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -35,19 +35,14 @@ USER flecsi
 WORKDIR /home/flecsi/flecsi
 RUN mkdir build
 
-RUN if [ "$RUNTIME" == "hpx" ]; then \
-        export ENABLE_TUTORIAL=OFF; \
-    else \
-        export ENABLE_TUTORIAL=ON; \
-    fi
-
 WORKDIR build
 RUN ccache -z
 RUN cmake \
           -DENABLE_LEGION=$LEGION \
           -DFLECSI_RUNTIME_MODEL=$RUNTIME \
           ${MINIMAL:+-DCMAKE_DISABLE_FIND_PACKAGE_METIS=ON} \
-	  -DFLECSI_ENABLE_TUTORIAL=$ENABLE_TUTORIAL \
+	  -DFLECSI_ENABLE_TUTORIAL=$([ "$RUNTIME" = "hpx" ] && \
+                     echo OFF || echo ON) \
           -DENABLE_UNIT_TESTS=ON \
           -DENABLE_PARMETIS=ON \
           -DENABLE_COLORING=ON \