From bf7efad250ed74e6c8301d9d514d2e55ecc68b2d Mon Sep 17 00:00:00 2001 From: Mingxuan Lin Date: Wed, 23 May 2018 19:51:11 +0200 Subject: [PATCH] Fix errors in CMake script --- CMakeLists.txt | 6 ++++-- src/CMakeLists.txt | 4 +++- src/homogenization_RGC.f90 | 0 3 files changed, 7 insertions(+), 3 deletions(-) mode change 100755 => 100644 src/homogenization_RGC.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index cd33a4b31..2507777df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,8 @@ elseif ("${DAMASK_SOLVER}" STREQUAL "FEM") project (DAMASK_FEM Fortran C) add_definitions (-DFEM) message ("Building FEM Solver\n") +else () + message (FATAL_ERROR "DAMASK_SOLVER is not defined!") endif () # set linker commands (needs to be done after defining the project) @@ -188,7 +190,7 @@ set (DAMASK_INCLUDE_FLAGS "${DAMASK_INCLUDE_FLAGS} ${PETSC_INCLUDES}") ################################################################################################### # Intel Compiler ################################################################################################### -if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel") +if ( CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") if (OPENMP) set (OPENMP_FLAGS "-qopenmp -parallel") @@ -308,7 +310,7 @@ if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel") ################################################################################################### # GNU Compiler ################################################################################################### -elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU") +elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") if (OPENMP) set (OPENMP_FLAGS "-fopenmp") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9789ec67d..e5865b829 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # special flags for some files -if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU") +if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") SET_SOURCE_FILES_PROPERTIES( "lattice.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") # long lines for interaction matrix @@ -22,6 +22,8 @@ if ("${PROJECT_NAME}" STREQUAL "DAMASK_spectral") add_library(DAMASK_INTERFACE OBJECT "spectral_interface.f90") elseif ("${PROJECT_NAME}" STREQUAL "DAMASK_FEM") add_library(DAMASK_INTERFACE OBJECT "FEM_interface.f90") +else () + message ( FATAL_ERROR "PROJECT_NAME is not defined!") endif() add_dependencies(DAMASK_INTERFACE PREC) list(APPEND OBJECTFILES $) diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 old mode 100755 new mode 100644