Commit d0f13b0

authored

Merge pull request #459 from wyphan/patch-1

Fix CMake variable usage

2 parents 492543d + 6e9e91c commit d0f13b0Copy full SHA for d0f13b0

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ jobs:`
`62`	`62`	`run: >-`
`63`	`63`	`cmake -Wdev`
`64`	`64`	`-DCMAKE_BUILD_TYPE=Release`
`65`		`- -DCMAKE_MAXIMUM_RANK=4`
	`65`	`+ -DCMAKE_MAXIMUM_RANK:String=4`
`66`	`66`	`-DCMAKE_INSTALL_PREFIX=$PWD/_dist`
`67`	`67`	`-S . -B build`
`68`	`68`
`@@ -179,7 +179,7 @@ jobs:`
`179`	`179`	`run: >-`
`180`	`180`	`cmake -Wdev`
`181`	`181`	`-DCMAKE_BUILD_TYPE=Release`
`182`		`- -DCMAKE_MAXIMUM_RANK=4`
	`182`	`+ -DCMAKE_MAXIMUM_RANK:String=4`
`183`	`183`	`-DCMAKE_INSTALL_PREFIX=$PWD/_dist`
`184`	`184`	`-S . -B build`
`185`	`185`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ jobs:`
`64`	`64`	`-B build`
`65`	`65`	`-DCMAKE_BUILD_TYPE=Debug`
`66`	`66`	`-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"`
`67`		`- -DCMAKE_MAXIMUM_RANK=4`
	`67`	`+ -DCMAKE_MAXIMUM_RANK:String=4`
`68`	`68`	`-DCMAKE_INSTALL_PREFIX=$PWD/_dist`
`69`	`69`	`env:`
`70`	`70`	`FC: gfortran`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ check_fortran_source_runs("i=0; error stop i; end" f18errorstop SRC_EXT f90)`
`49`	`49`	`check_fortran_source_compiles("real, allocatable :: array(:, :, :, :, :, :, :, :, :, :); end" f03rank SRC_EXT f90)`
`50`	`50`	`check_fortran_source_runs("use, intrinsic :: iso_fortran_env, only : real128; real(real128) :: x; x = x+1; end" f03real128)`
`51`	`51`
`52`		`-option(CMAKE_MAXIMUM_RANK "Maximum array rank for generated procedures" 4)`
	`52`	`+if(NOT DEFINED CMAKE_MAXIMUM_RANK)`
	`53`	`+ set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")`
	`54`	`+endif()`
`53`	`55`
`54`	`56`	`# --- find preprocessor`
`55`	`57`	`find_program(FYPP fypp)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ Important options are`
`136`	`136`	`For example, to configure a build using the Ninja backend and generating procedures up to rank 7, which is installed to your home directory use`
`137`	`137`
`138`	`138`	```sh
`139`		`-cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local`
	`139`	`+cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK:String=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local`
`140`	`140`	```
`141`	`141`
`142`	`142`	`To build the standard library run`

Comments

(0)