Skip to content

Commit 31bec23

Browse files
committed
default to shared on all but win32
1 parent 3917f70 commit 31bec23

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ if(NOT realbits)
1111
set(realbits 64)
1212
endif()
1313

14-
# --- other libraries
15-
add_library(maptran SHARED src/maptran.F90 src/vallado.F90)
14+
if(NOT WIN32)
15+
option(BUILD_SHARED_LIBS "Shared libraries .so. Feel free to turn off." ON)
16+
endif()
17+
18+
# --- Maptran library
19+
add_library(maptran src/maptran.F90 src/vallado.F90)
1620
target_compile_options(maptran PRIVATE ${FFLAGS})
1721
target_compile_definitions(maptran PUBLIC REALBITS=${realbits})
1822
# --- testing

src/vallado.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module vallado
1414

1515
real(wp), parameter :: pi = 4._wp * atan(1.0_wp)
1616

17-
type,public :: time
17+
type,public :: datetime
1818
integer :: year, month, day, hour, minute
1919
real(wp) :: second
2020
end type
@@ -133,7 +133,7 @@ elemental real(wp) function toJulian(t) result(jd)
133133
! -----
134134
! JD: Julian Date
135135

136-
type(time), intent(in) :: t
136+
type(datetime), intent(in) :: t
137137
real(wp) :: B, y, m
138138

139139
y = t%year

tests/test_mod.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ program Test
2323
deg0 = [15,30,45], &
2424
aaz = [33,43,53]
2525

26-
type(time), parameter :: t0 = time(2014,4,6,8,0,0) ! UTC
26+
type(datetime), parameter :: t0 = datetime(2014,4,6,8,0,0) ! UTC
2727
real(wp), parameter :: jd0 = 2456753.833333_wp
2828

2929

@@ -190,5 +190,5 @@ program Test
190190
err_msg='angle_sep')
191191

192192

193-
print *,'OK: Maptran'
193+
print *,'OK: Maptran ',storage_size(0._wp),' bits'
194194
end program

0 commit comments

Comments
 (0)