From 67352d9ec72b5198e07ce482aa6c9cfe4b44afc1 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 19 May 2021 19:22:06 +0200
Subject: [PATCH] location depends on PETSC_ARCH (if set)

---
 CMakeLists.txt     | 10 +++++-----
 src/CMakeLists.txt | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6491eafb6..a6a133fe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required (VERSION 3.10.0)
 include (FindPkgConfig REQUIRED)
 
-set(PETSC_DIR $ENV{PETSC_DIR})
-if (PETSC_DIR STREQUAL "")
+if (DEFINED ENV{PETSC_DIR})
+    message ("PETSC_DIR:\n$ENV{PETSC_DIR}\n")
+else ()
     message (FATAL_ERROR "PETSc location (PETSC_DIR) is not defined")
 endif ()
-message ("PETSC_DIR:\n${PETSC_DIR}\n")
 
 # Dummy project to determine compiler names and version
 project (Prerequisites LANGUAGES)
@@ -79,13 +79,13 @@ else ()
     message (FATAL_ERROR "Compiler type (CMAKE_Fortran_COMPILER_ID) not recognized")
 endif ()
 
-file (STRINGS "${PETSC_DIR}/lib/petsc/conf/petscvariables" PETSC_EXTERNAL_LIB REGEX "PETSC_WITH_EXTERNAL_LIB = .*$?")
+file (STRINGS "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/petsc/conf/petscvariables" PETSC_EXTERNAL_LIB REGEX "PETSC_WITH_EXTERNAL_LIB = .*$?")
 string (REGEX MATCHALL "-[lLW]([^\" ]+)" PETSC_EXTERNAL_LIB "${PETSC_EXTERNAL_LIB}")
 list (REMOVE_DUPLICATES PETSC_EXTERNAL_LIB)
 string (REPLACE ";" " " PETSC_EXTERNAL_LIB "${PETSC_EXTERNAL_LIB}")
 message ("PETSC_EXTERNAL_LIB:\n${PETSC_EXTERNAL_LIB}\n")
 
-file (STRINGS "${PETSC_DIR}/lib/petsc/conf/petscvariables" PETSC_INCLUDES REGEX "PETSC_FC_INCLUDES = .*$?")
+file (STRINGS "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/petsc/conf/petscvariables" PETSC_INCLUDES REGEX "PETSC_FC_INCLUDES = .*$?")
 string (REGEX MATCHALL "-I([^\" ]+)" PETSC_INCLUDES "${PETSC_INCLUDES}")
 list (REMOVE_DUPLICATES PETSC_INCLUDES)
 string (REPLACE ";" " " PETSC_INCLUDES "${PETSC_INCLUDES}")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c20754a67..af0c75223 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,23 +14,23 @@ list(FILTER damask-sources EXCLUDE REGEX ".*commercialFEM_fileList.*.f90")
 
 if (PROJECT_NAME STREQUAL "damask-grid")
 
-      file(GLOB grid-sources grid/*.f90)
+    file(GLOB grid-sources grid/*.f90)
 
-      if(NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
+    if (NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
         add_executable(DAMASK_grid ${damask-sources} ${grid-sources})
         install (TARGETS DAMASK_grid RUNTIME DESTINATION bin)
-      else()
+    else ()
         add_library(DAMASK_grid OBJECT ${damask-sources} ${grid-sources})
         exec_program (mktemp OUTPUT_VARIABLE nothing)
         exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole)
         install (PROGRAMS ${nothing} DESTINATION ${black_hole})
-      endif()
+    endif ()
 
 elseif (PROJECT_NAME STREQUAL "damask-mesh")
       
-      file(GLOB mesh-sources mesh/*.f90)
+    file(GLOB mesh-sources mesh/*.f90)
 
-      add_executable(DAMASK_mesh ${damask-sources} ${mesh-sources})
-      install (TARGETS DAMASK_mesh RUNTIME DESTINATION bin)
+    add_executable(DAMASK_mesh ${damask-sources} ${mesh-sources})
+    install (TARGETS DAMASK_mesh RUNTIME DESTINATION bin)
       
-endif()
+endif ()