Skip to content

Commit df1a58f

Browse files
committed
use 2 spaces for CMake indentation
1 parent 91d0d5f commit df1a58f

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

CMakeLists.txt

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.18.0)
22
include(FindPkgConfig REQUIRED)
33

44
if(DEFINED ENV{PETSC_DIR})
5-
message("PETSC_DIR:\n$ENV{PETSC_DIR}\n")
5+
message("PETSC_DIR:\n$ENV{PETSC_DIR}\n")
66
else()
7-
message(FATAL_ERROR "PETSc location (PETSC_DIR) is not defined")
7+
message(FATAL_ERROR "PETSc location (PETSC_DIR) is not defined")
88
endif()
99

1010
# Dummy project to determine compiler names and version
@@ -20,9 +20,9 @@ pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler)
2020
string(TOUPPER "${DAMASK_SOLVER}" DAMASK_SOLVER_UPPER)
2121
string(TOLOWER "${DAMASK_SOLVER}" DAMASK_SOLVER_LOWER)
2222
if("${DAMASK_SOLVER_UPPER}" MATCHES "^(GRID|MESH|TEST)$")
23-
project("damask-${DAMASK_SOLVER_LOWER}" HOMEPAGE_URL https://damask-multiphysics.org LANGUAGES Fortran C)
23+
project("damask-${DAMASK_SOLVER_LOWER}" HOMEPAGE_URL https://damask-multiphysics.org LANGUAGES Fortran C)
2424
else()
25-
message(FATAL_ERROR "Invalid solver: DAMASK_SOLVER=${DAMASK_SOLVER}")
25+
message(FATAL_ERROR "Invalid solver: DAMASK_SOLVER=${DAMASK_SOLVER}")
2626
endif()
2727
add_definitions("-D${DAMASK_SOLVER_UPPER}")
2828

@@ -34,7 +34,7 @@ pkg_check_modules(HDF5 hdf5)
3434
pkg_check_modules(FFTW3 fftw3)
3535
pkg_check_modules(fYAML libfyaml)
3636
if(DAMASK_SOLVER_UPPER STREQUAL "GRID")
37-
pkg_check_modules(zlib zlib)
37+
pkg_check_modules(zlib zlib)
3838
endif()
3939

4040
file(STRINGS ${PROJECT_SOURCE_DIR}/VERSION DAMASK_VERSION)
@@ -57,71 +57,71 @@ add_definitions(-DDAMASK_VERSION_MAJOR="${DAMASK_VERSION_MAJOR}")
5757
add_definitions(-DDAMASK_VERSION_MINOR="${DAMASK_VERSION_MINOR}")
5858
add_definitions(-DDAMASK_VERSION_PATCH="${DAMASK_VERSION_PATCH}")
5959
if(DEFINED DAMASK_VERSION_HASH)
60-
add_definitions(-DDAMASK_VERSION_HASH="${DAMASK_VERSION_HASH}")
60+
add_definitions(-DDAMASK_VERSION_HASH="${DAMASK_VERSION_HASH}")
6161
endif()
6262

6363
add_definitions(-DCMAKE_SYSTEM_NAME="${CMAKE_SYSTEM_NAME}")
6464
add_definitions(-DCMAKE_SYSTEM_PROCESSOR="${CMAKE_SYSTEM_PROCESSOR}")
6565

6666
if(PETSC_VERSION VERSION_EQUAL 3.17.0)
67-
add_definitions("-DCHKERRQ=PetscCall")
67+
add_definitions("-DCHKERRQ=PetscCall")
6868
endif()
6969

7070
if(CMAKE_BUILD_TYPE STREQUAL "")
71-
set(CMAKE_BUILD_TYPE "RELEASE")
71+
set(CMAKE_BUILD_TYPE "RELEASE")
7272
endif()
7373
string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
7474

7575
# Predefined sets for OPTIMIZATION/OPENMP based on BUILD_TYPE
7676
if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
77-
set(DEBUG_FLAGS "${DEBUG_FLAGS} -DDEBUG")
78-
set(PARALLEL "OFF")
79-
set(OPTI "DEBUG")
77+
set(DEBUG_FLAGS "${DEBUG_FLAGS} -DDEBUG")
78+
set(PARALLEL "OFF")
79+
set(OPTI "DEBUG")
8080
elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE")
81-
set(PARALLEL "ON")
82-
set(OPTI "DEFENSIVE")
81+
set(PARALLEL "ON")
82+
set(OPTI "DEFENSIVE")
8383
elseif(CMAKE_BUILD_TYPE STREQUAL "DEBUGRELEASE")
84-
set(DEBUG_FLAGS "${DEBUG_FLAGS} -DDEBUG")
85-
set(PARALLEL "ON")
86-
set(OPTI "DEFENSIVE")
84+
set(DEBUG_FLAGS "${DEBUG_FLAGS} -DDEBUG")
85+
set(PARALLEL "ON")
86+
set(OPTI "DEFENSIVE")
8787
elseif(CMAKE_BUILD_TYPE STREQUAL "PERFORMANCE")
88-
set(PARALLEL "ON")
89-
set(OPTI "AGGRESSIVE")
88+
set(PARALLEL "ON")
89+
set(OPTI "AGGRESSIVE")
9090
else()
91-
message(FATAL_ERROR "Invalid build type: CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
91+
message(FATAL_ERROR "Invalid build type: CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
9292
endif()
9393

9494
# $OPTIMIZATION takes precedence over $BUILD_TYPE defaults
9595
if(OPTIMIZATION STREQUAL "" OR NOT DEFINED OPTIMIZATION)
96-
set(OPTIMIZATION "${OPTI}")
96+
set(OPTIMIZATION "${OPTI}")
9797
else()
98-
set(OPTIMIZATION "${OPTIMIZATION}")
98+
set(OPTIMIZATION "${OPTIMIZATION}")
9999
endif()
100100

101101
# $OPENMP takes precedence over $BUILD_TYPE defaults
102102
if(OPENMP STREQUAL "" OR NOT DEFINED OPENMP)
103-
set(OPENMP "${PARALLEL}")
103+
set(OPENMP "${PARALLEL}")
104104
else()
105-
set(OPENMP "${OPENMP}")
105+
set(OPENMP "${OPENMP}")
106106
endif()
107107

108108
# syntax check only(mainly for pre-receive hook)
109109
if(CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
110-
set(BUILDCMD_POST "${BUILDCMD_POST} -fsyntax-only")
110+
set(BUILDCMD_POST "${BUILDCMD_POST} -fsyntax-only")
111111
endif()
112112

113113

114114
if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
115-
set(Fortran_COMPILER_VERSION_MIN 11.1)
115+
set(Fortran_COMPILER_VERSION_MIN 11.1)
116116
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
117-
set(Fortran_COMPILER_VERSION_MIN 19)
117+
set(Fortran_COMPILER_VERSION_MIN 19)
118118
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
119-
set(Fortran_COMPILER_VERSION_MIN 20)
119+
set(Fortran_COMPILER_VERSION_MIN 20)
120120
else()
121-
message(FATAL_ERROR "Compiler '${CMAKE_Fortran_COMPILER_ID}' not supported")
121+
message(FATAL_ERROR "Compiler '${CMAKE_Fortran_COMPILER_ID}' not supported")
122122
endif()
123123
if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS Fortran_COMPILER_VERSION_MIN)
124-
message(FATAL_ERROR "Version '${CMAKE_Fortran_COMPILER_VERSION}' of '${CMAKE_Fortran_COMPILER_ID}' is not supported")
124+
message(FATAL_ERROR "Version '${CMAKE_Fortran_COMPILER_VERSION}' of '${CMAKE_Fortran_COMPILER_ID}' is not supported")
125125
endif()
126126

127127
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -141,25 +141,25 @@ set(CMAKE_Fortran_LINK_EXECUTABLE "${BUILDCMD_PRE} ${CMAKE_Fortran_COM
141141
set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} ${PETSC_INCLUDES}") # zlib installed via PETSc
142142

143143
if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
144-
set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}} ${DEBUG_FLAGS}")
145-
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} ${DEBUG_FLAGS}")
144+
set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}} ${DEBUG_FLAGS}")
145+
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} ${DEBUG_FLAGS}")
146146
endif()
147147

148148
set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE}} ${PETSC_INCLUDES} ${BUILDCMD_POST}")
149149

150150
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -L${PETSC_LIBRARY_DIRS} -lpetsc ${PETSC_EXTERNAL_LIB}")
151151
if(DAMASK_SOLVER_UPPER STREQUAL "GRID")
152-
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -lz")
152+
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -lz")
153153
endif()
154154

155155
if(fYAML_FOUND STREQUAL "1")
156-
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS}")
157-
foreach(fYAML_LIBRARY ${fYAML_LIBRARIES})
158-
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS} -l${fYAML_LIBRARY}")
159-
endforeach()
160-
add_definitions(-DFYAML)
161-
pkg_get_variable(fYAML_INCLUDE_DIR libfyaml includedir) # fYAML_INCLUDE_DIRS and fYAML_CFLAGS are not working
162-
set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}")
156+
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS}")
157+
foreach(fYAML_LIBRARY ${fYAML_LIBRARIES})
158+
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS} -l${fYAML_LIBRARY}")
159+
endforeach()
160+
add_definitions(-DFYAML)
161+
pkg_get_variable(fYAML_INCLUDE_DIR libfyaml includedir) # fYAML_INCLUDE_DIRS and fYAML_CFLAGS are not working
162+
set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}")
163163
endif()
164164

165165
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} ${BUILDCMD_POST}")

src/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ set(executable-name "DAMASK_${DAMASK_SOLVER_LOWER}")
44
file(GLOB solver-sources CONFIGURE_DEPENDS ${DAMASK_SOLVER_LOWER}/*.f90)
55

66
if(NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
7-
add_executable(${executable-name} ${damask-sources} ${solver-sources})
8-
install(TARGETS ${executable-name} RUNTIME DESTINATION bin)
7+
add_executable(${executable-name} ${damask-sources} ${solver-sources})
8+
install(TARGETS ${executable-name} RUNTIME DESTINATION bin)
99
else()
10-
add_library(${executable-name} OBJECT ${damask-sources} ${solver-sources})
11-
exec_program(mktemp OUTPUT_VARIABLE nothing)
12-
exec_program(mktemp ARGS -d OUTPUT_VARIABLE black_hole)
13-
install(PROGRAMS ${nothing} DESTINATION ${black_hole})
10+
add_library(${executable-name} OBJECT ${damask-sources} ${solver-sources})
11+
exec_program(mktemp OUTPUT_VARIABLE nothing)
12+
exec_program(mktemp ARGS -d OUTPUT_VARIABLE black_hole)
13+
install(PROGRAMS ${nothing} DESTINATION ${black_hole})
1414
endif()
1515

1616
string(REPLACE ";" "\n" sources "${damask-sources};${solver-sources}")

0 commit comments

Comments
 (0)