move GNUDirs include a bit down again...

haampie · haampie · commit 6f434e8a9fd7 · 2021-05-18T23:46:50.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(cmake/build_type.cmake)
 include(cmake/adjust_mpiexec_flags.cmake)
-include(GNUInstallDirs)
 
 # Options
 #
@@ -91,6 +90,8 @@ endif()
 
 project(cosma VERSION 2.4.0 LANGUAGES CXX)
 
+include(GNUInstallDirs)
+
 # preserve rpaths when installing and make the install folder relocatable
 # use `CMAKE_SKIP_INSTALL_RPATH` to skip this
 # https://spack.readthedocs.io/en/latest/workflows.html#write-the-cmake-build
diff --git a/docker/asan/deploy.Dockerfile b/docker/asan/deploy.Dockerfile
@@ -14,9 +14,9 @@ RUN mkdir /COSMA/build && cd /COSMA/build && \
       -DCOSMA_SCALAPACK=CUSTOM \
       -DCMAKE_BUILD_TYPE=Debug \
       -DCMAKE_CXX_FLAGS_DEBUG="-g -Og -fno-omit-frame-pointer -fsanitize=address,undefined" \
-      -DCMAKE_INSTALL_PREFIX=/usr && \
+      -DCMAKE_INSTALL_PREFIX=/root/COSMA-build && \
       make -j$(nproc) && \
-      make DESTDIR=/root/COSMA-build install && \
+      make install && \
       rm -rf /COSMA
 
 RUN /root/libtree/libtree \
diff --git a/docker/cpu-release/deploy.Dockerfile b/docker/cpu-release/deploy.Dockerfile
@@ -9,13 +9,12 @@ RUN COMPILERVARS_ARCHITECTURE=intel64 /opt/intel/bin/compilervars.sh && \
     mkdir /COSMA/build && cd /COSMA/build && \
     CC=mpicc CXX=mpicxx cmake .. \
       -DCOSMA_WITH_TESTS=ON \
-      -DCUDA_PATH=/usr/local/cuda \
       -DCOSMA_BLAS=MKL \
       -DCOSMA_SCALAPACK=MKL \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr && \
+      -DCMAKE_INSTALL_PREFIX=/root/COSMA-build && \
       make -j$(nproc) && \
-      make DESTDIR=/root/COSMA-build install && \
+      make install && \
       rm -rf /COSMA
 
 ENV MKL_LIB=/opt/intel/compilers_and_libraries/linux/mkl/lib/intel64
diff --git a/docker/gpu/deploy.Dockerfile b/docker/gpu/deploy.Dockerfile
@@ -14,9 +14,9 @@ RUN mkdir /COSMA/build && cd /COSMA/build && \
       -DCOSMA_BLAS=CUDA \
       -DCOSMA_SCALAPACK=CUSTOM \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr && \
+      -DCMAKE_INSTALL_PREFIX=/root/COSMA-build && \
       make -j$(nproc) && \
-      make DESTDIR=/root/COSMA-build install && \
+      make && \
       rm -rf /COSMA
 
 # Run linuxdeploy, and add a bunch of libs that are dlopen'ed by mkl
