Compare commits

...

3 Commits

Author SHA1 Message Date
Mattia Verga 6e99ce3639
Merge 59983adbba into d288119b8b 2025-03-10 06:41:51 -05:00
Brandon Rhodes d288119b8b New wmm.cof from original maintainer Elwood Downey 2025-02-11 18:14:55 -05:00
Mattia Verga 59983adbba Add cmake directives
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
2025-01-20 09:26:08 +01:00
10 changed files with 474 additions and 89 deletions

76
CMakeLists.txt Normal file
View File

@ -0,0 +1,76 @@
cmake_minimum_required(VERSION 3.10)
project(xephem VERSION 4.1.0 LANGUAGES C)
set(DISPLAY_NAME "XEphem")
set(CMAKE_C_STANDARD 17)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
# Required packages
find_package(Motif REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(X11 REQUIRED)
# Optional packages
find_package(JPEG)
find_package(PNG)
find_package(ZLIB)
# Define installation directories
if((NOT WIN32) AND (NOT NATIVE_OSX_APP))
include(GNUInstallDirs)
endif()
if(NATIVE_OSX_APP)
set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.app/Contents")
set(CMAKE_INSTALL_FULL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
set(CMAKE_INSTALL_BINDIR "MacOS")
set(XEPHEM_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
elseif(WIN32)
set(CMAKE_INSTALL_BINDIR ".")
set(CMAKE_INSTALL_DATAROOTDIR ".")
set(CMAKE_INSTALL_DATADIR ".")
set(CMAKE_INSTALL_FULL_LOCALEDIR "locale")
set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
set(XEPHEM_DATADIR "${CMAKE_INSTALL_DATADIR}")
else()
set(XEPHEM_DATADIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}")
endif()
# Build libraries
add_subdirectory(libastro)
add_subdirectory(libip)
if(NOT JPEG_FOUND)
add_subdirectory(libjpegd)
endif()
add_subdirectory(liblilxml)
if(NOT PNG_FOUND)
add_subdirectory(libpng)
endif()
if(NOT ZLIB_FOUND)
add_subdirectory(libz)
endif()
# Build main program
add_subdirectory(GUI/xephem)
# Install
install(TARGETS xephem
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${CMAKE_BINARY_DIR}/xephem.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
install(DIRECTORY GUI/xephem/auxil
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/catalogs
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/fifos
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/fits
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/gallery
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/help
DESTINATION ${XEPHEM_DATADIR})
install(DIRECTORY GUI/xephem/lo
DESTINATION ${XEPHEM_DATADIR})

95
GUI/xephem/CMakeLists.txt Normal file
View File

@ -0,0 +1,95 @@
cmake_minimum_required(VERSION 3.10)
set(SRC_FILES
aavso.c
annotmenu.c
broadcast.c
calmenu.c
closemenu.c
compiler.c
coordsmenu.c
datamenu.c
db.c
dbmenu.c
earthmap.c
earthmenu.c
fallbacks.c
favmenu.c
formats.c
fsmenu.c
gallerymenu.c
glance.c
gsc.c
gscnet.c
helpmenu.c
homeio.c
hznmenu.c
imregmenu.c
indimenu.c
jpeg2pm.c
jupmenu.c
listmenu.c
mainmenu.c
marsmenu.c
marsmmenu.c
moonmenu.c
moviemenu.c
msgmenu.c
netmenu.c
objmenu.c
obslog.c
patchlevel.c
plot_aux.c
plotmenu.c
preferences.c
progress.c
ps.c
query.c
rotated.c
satmenu.c
saveres.c
scope.c
sites.c
skybinary.c
skyeyep.c
skyfifos.c
skyfiltmenu.c
skyfits.c
skyhist.c
skyip.c
skylist.c
skytoolbar.c
skyviewmenu.c
solsysmenu.c
splash.c
srchmenu.c
sunmenu.c
time.c
tips.c
trailmenu.c
ucac.c
uranusmenu.c
usno.c
versionmenu.c
webdbmenu.c
xe2.c
xe3.c
xephem.c
xmisc.c)
set(TARGET_LIB astro ip lilxml m png ssl Xm Xt Xext Xmu X11 z)
if(NOT JPEG_FOUND)
set(TARGET_LIB ${TARGET_LIB} jpegd)
else()
set(TARGET_LIB ${TARGET_LIB} jpeg)
endif()
add_executable(xephem ${SRC_FILES})
target_link_libraries(xephem ${TARGET_LIB})
add_custom_command(TARGET xephem
POST_BUILD
COMMAND nroff -man ${CMAKE_CURRENT_SOURCE_DIR}/xephem.man > xephem.1
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building manpage"
VERBATIM)

View File

@ -1,93 +1,93 @@
2020.0 WMM-2020 12/10/2019 2025.0 WMM-2025 11/13/2024
1 0 -29404.5 0.0 6.7 0.0 1 0 -29351.8 0.0 12.0 0.0
1 1 -1450.7 4652.9 7.7 -25.1 1 1 -1410.8 4545.4 9.7 -21.5
2 0 -2500.0 0.0 -11.5 0.0 2 0 -2556.6 0.0 -11.6 0.0
2 1 2982.0 -2991.6 -7.1 -30.2 2 1 2951.1 -3133.6 -5.2 -27.7
2 2 1676.8 -734.8 -2.2 -23.9 2 2 1649.3 -815.1 -8.0 -12.1
3 0 1363.9 0.0 2.8 0.0 3 0 1361.0 0.0 -1.3 0.0
3 1 -2381.0 -82.2 -6.2 5.7 3 1 -2404.1 -56.6 -4.2 4.0
3 2 1236.2 241.8 3.4 -1.0 3 2 1243.8 237.5 0.4 -0.3
3 3 525.7 -542.9 -12.2 1.1 3 3 453.6 -549.5 -15.6 -4.1
4 0 903.1 0.0 -1.1 0.0 4 0 895.0 0.0 -1.6 0.0
4 1 809.4 282.0 -1.6 0.2 4 1 799.5 278.6 -2.4 -1.1
4 2 86.2 -158.4 -6.0 6.9 4 2 55.7 -133.9 -6.0 4.1
4 3 -309.4 199.8 5.4 3.7 4 3 -281.1 212.0 5.6 1.6
4 4 47.9 -350.1 -5.5 -5.6 4 4 12.1 -375.6 -7.0 -4.4
5 0 -234.4 0.0 -0.3 0.0 5 0 -233.2 0.0 0.6 0.0
5 1 363.1 47.7 0.6 0.1 5 1 368.9 45.4 1.4 -0.5
5 2 187.8 208.4 -0.7 2.5 5 2 187.2 220.2 0.0 2.2
5 3 -140.7 -121.3 0.1 -0.9 5 3 -138.7 -122.9 0.6 0.4
5 4 -151.2 32.2 1.2 3.0 5 4 -142.0 43.0 2.2 1.7
5 5 13.7 99.1 1.0 0.5 5 5 20.9 106.1 0.9 1.9
6 0 65.9 0.0 -0.6 0.0 6 0 64.4 0.0 -0.2 0.0
6 1 65.6 -19.1 -0.4 0.1 6 1 63.8 -18.4 -0.4 0.3
6 2 73.0 25.0 0.5 -1.8 6 2 76.9 16.8 0.9 -1.6
6 3 -121.5 52.7 1.4 -1.4 6 3 -115.7 48.8 1.2 -0.4
6 4 -36.2 -64.4 -1.4 0.9 6 4 -40.9 -59.8 -0.9 0.9
6 5 13.5 9.0 -0.0 0.1 6 5 14.9 10.9 0.3 0.7
6 6 -64.7 68.1 0.8 1.0 6 6 -60.7 72.7 0.9 0.9
7 0 80.6 0.0 -0.1 0.0 7 0 79.5 0.0 -0.0 0.0
7 1 -76.8 -51.4 -0.3 0.5 7 1 -77.0 -48.9 -0.1 0.6
7 2 -8.3 -16.8 -0.1 0.6 7 2 -8.8 -14.4 -0.1 0.5
7 3 56.5 2.3 0.7 -0.7 7 3 59.3 -1.0 0.5 -0.8
7 4 15.8 23.5 0.2 -0.2 7 4 15.8 23.4 -0.1 0.0
7 5 6.4 -2.2 -0.5 -1.2 7 5 2.5 -7.4 -0.8 -1.0
7 6 -7.2 -27.2 -0.8 0.2 7 6 -11.1 -25.1 -0.8 0.6
7 7 9.8 -1.9 1.0 0.3 7 7 14.2 -2.3 0.8 -0.2
8 0 23.6 0.0 -0.1 0.0 8 0 23.2 0.0 -0.1 0.0
8 1 9.8 8.4 0.1 -0.3 8 1 10.8 7.1 0.2 -0.2
8 2 -17.5 -15.3 -0.1 0.7 8 2 -17.5 -12.6 0.0 0.5
8 3 -0.4 12.8 0.5 -0.2 8 3 2.0 11.4 0.5 -0.4
8 4 -21.1 -11.8 -0.1 0.5 8 4 -21.7 -9.7 -0.1 0.4
8 5 15.3 14.9 0.4 -0.3 8 5 16.9 12.7 0.3 -0.5
8 6 13.7 3.6 0.5 -0.5 8 6 15.0 0.7 0.2 -0.6
8 7 -16.5 -6.9 0.0 0.4 8 7 -16.8 -5.2 -0.0 0.3
8 8 -0.3 2.8 0.4 0.1 8 8 0.9 3.9 0.2 0.2
9 0 5.0 0.0 -0.1 0.0 9 0 4.6 0.0 -0.0 0.0
9 1 8.2 -23.3 -0.2 -0.3 9 1 7.8 -24.8 -0.1 -0.3
9 2 2.9 11.1 -0.0 0.2 9 2 3.0 12.2 0.1 0.3
9 3 -1.4 9.8 0.4 -0.4 9 3 -0.2 8.3 0.3 -0.3
9 4 -1.1 -5.1 -0.3 0.4 9 4 -2.5 -3.3 -0.3 0.3
9 5 -13.3 -6.2 -0.0 0.1 9 5 -13.1 -5.2 0.0 0.2
9 6 1.1 7.8 0.3 -0.0 9 6 2.4 7.2 0.3 -0.1
9 7 8.9 0.4 -0.0 -0.2 9 7 8.6 -0.6 -0.1 -0.2
9 8 -9.3 -1.5 -0.0 0.5 9 8 -8.7 0.8 0.1 0.4
9 9 -11.9 9.7 -0.4 0.2 9 9 -12.9 10.0 -0.1 0.1
10 0 -1.9 0.0 0.0 0.0 10 0 -1.3 0.0 0.1 0.0
10 1 -6.2 3.4 -0.0 -0.0 10 1 -6.4 3.3 0.0 0.0
10 2 -0.1 -0.2 -0.0 0.1 10 2 0.2 0.0 0.1 -0.0
10 3 1.7 3.5 0.2 -0.3 10 3 2.0 2.4 0.1 -0.2
10 4 -0.9 4.8 -0.1 0.1 10 4 -1.0 5.3 -0.0 0.1
10 5 0.6 -8.6 -0.2 -0.2 10 5 -0.6 -9.1 -0.3 -0.1
10 6 -0.9 -0.1 -0.0 0.1 10 6 -0.9 0.4 0.0 0.1
10 7 1.9 -4.2 -0.1 -0.0 10 7 1.5 -4.2 -0.1 0.0
10 8 1.4 -3.4 -0.2 -0.1 10 8 0.9 -3.8 -0.1 -0.1
10 9 -2.4 -0.1 -0.1 0.2 10 9 -2.7 0.9 -0.0 0.2
10 10 -3.9 -8.8 -0.0 -0.0 10 10 -3.9 -9.1 -0.0 -0.0
11 0 3.0 0.0 -0.0 0.0 11 0 2.9 0.0 0.0 0.0
11 1 -1.4 -0.0 -0.1 -0.0 11 1 -1.5 0.0 -0.0 -0.0
11 2 -2.5 2.6 -0.0 0.1 11 2 -2.5 2.9 0.0 0.1
11 3 2.4 -0.5 0.0 0.0 11 3 2.4 -0.6 0.0 -0.0
11 4 -0.9 -0.4 -0.0 0.2 11 4 -0.6 0.2 0.0 0.1
11 5 0.3 0.6 -0.1 -0.0 11 5 -0.1 0.5 -0.1 -0.0
11 6 -0.7 -0.2 0.0 0.0 11 6 -0.6 -0.3 0.0 -0.0
11 7 -0.1 -1.7 -0.0 0.1 11 7 -0.1 -1.2 -0.0 0.1
11 8 1.4 -1.6 -0.1 -0.0 11 8 1.1 -1.7 -0.1 -0.0
11 9 -0.6 -3.0 -0.1 -0.1 11 9 -1.0 -2.9 -0.1 0.0
11 10 0.2 -2.0 -0.1 0.0 11 10 -0.2 -1.8 -0.1 0.0
11 11 3.1 -2.6 -0.1 -0.0 11 11 2.6 -2.3 -0.1 0.0
12 0 -2.0 0.0 0.0 0.0 12 0 -2.0 0.0 0.0 0.0
12 1 -0.1 -1.2 -0.0 -0.0 12 1 -0.2 -1.3 0.0 -0.0
12 2 0.5 0.5 -0.0 0.0 12 2 0.3 0.7 -0.0 0.0
12 3 1.3 1.3 0.0 -0.1 12 3 1.2 1.0 -0.0 -0.1
12 4 -1.2 -1.8 -0.0 0.1 12 4 -1.3 -1.4 -0.0 0.1
12 5 0.7 0.1 -0.0 -0.0 12 5 0.6 -0.0 -0.0 -0.0
12 6 0.3 0.7 0.0 0.0 12 6 0.6 0.6 0.1 -0.0
12 7 0.5 -0.1 -0.0 -0.0 12 7 0.5 -0.1 -0.0 -0.0
12 8 -0.2 0.6 0.0 0.1 12 8 -0.1 0.8 0.0 0.0
12 9 -0.5 0.2 -0.0 -0.0 12 9 -0.4 0.1 0.0 -0.0
12 10 0.1 -0.9 -0.0 -0.0 12 10 -0.2 -1.0 -0.1 -0.0
12 11 -1.1 -0.0 -0.0 0.0 12 11 -1.3 0.1 -0.0 0.0
12 12 -0.3 0.5 -0.1 -0.1 12 12 -0.7 0.2 -0.1 -0.1
999999999999999999999999999999999999999999999999 999999999999999999999999999999999999999999999999
999999999999999999999999999999999999999999999999 999999999999999999999999999999999999999999999999

View File

@ -4,6 +4,14 @@
</head> </head>
<BODY background="/bg.png" TEXT="#000000" LINK="#004400" VLINK="#004400" ALINK="#000000"> <BODY background="/bg.png" TEXT="#000000" LINK="#004400" VLINK="#004400" ALINK="#000000">
<!-- next release
<li>Elwood has updated the <tt>wmm.cof</tt>
World Magnetic Model file
to reflect the new WMM2025 data that was released on December 17, 2024.
-->
<H3>Changes from 4.1.0 to 4.2.0</H3> <H3>Changes from 4.1.0 to 4.2.0</H3>
Released 2024 February 13. Released 2024 February 13.

69
libastro/CMakeLists.txt Normal file
View File

@ -0,0 +1,69 @@
cmake_minimum_required(VERSION 3.10)
project(libastro C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
aa_hadec.c
aberration.c
actan.c
airmass.c
anomaly.c
ap_as.c
atlas.c
auxil.c
bdl.c
chap95.c
chap95_data.c
circum.c
comet.c
constel.c
dbfmt.c
deep.c
deltat.c
earthsat.c
eq_ecl.c
eq_gal.c
formats.c
helio.c
jupmoon.c
libration.c
magdecl.c
marsmoon.c
misc.c
mjd.c
moon.c
mooncolong.c
moonnf.c
nutation.c
obliq.c
parallactic.c
parallax.c
plans.c
plmoon.c
plshadow.c
precess.c
reduce.c
refract.c
rings.c
riset.c
riset_cir.c
satmoon.c
sdp4.c
sgp4.c
sphcart.c
sun.c
thetag.c
twobody.c
umoon.c
utc_gst.c
vsop87.c
vsop87_data.c)
add_library(astro STATIC ${SRC_FILES})
target_include_directories(astro PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")

26
libip/CMakeLists.txt Normal file
View File

@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 3.10)
project(libip C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
explodegif.c
fits.c
fsmatch.c
gaussfit.c
lstsqr.c
median.c
sqr.c
stars.c
stats.c
walk.c
wcs.c)
add_library(ip STATIC ${SRC_FILES})
target_link_libraries(ip astro)
target_include_directories(ip PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")

40
libjpegd/CMakeLists.txt Normal file
View File

@ -0,0 +1,40 @@
cmake_minimum_required(VERSION 3.10)
project(libjpegd C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
jcomapi.c
jdapimin.c
jdapistd.c
jdatasrc.c
jdcoefct.c
jdcolor.c
jddctmgr.c
jdhuff.c
jdinput.c
jdmainct.c
jdmarker.c
jdmaster.c
jdmerge.c
jdphuff.c
jdpostct.c
jdsample.c
jerror.c
jidctflt.c
jidctfst.c
jidctint.c
jidctred.c
jmemmgr.c
jmemnobs.c
jquant1.c
jquant2.c
jutils.c)
add_library(jpegd STATIC ${SRC_FILES})
target_include_directories(jpegd PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")

16
liblilxml/CMakeLists.txt Normal file
View File

@ -0,0 +1,16 @@
cmake_minimum_required(VERSION 3.10)
project(liblilxml C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
base64.c
lilxml.c)
add_library(lilxml STATIC ${SRC_FILES})
target_include_directories(lilxml PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")

30
libpng/CMakeLists.txt Normal file
View File

@ -0,0 +1,30 @@
cmake_minimum_required(VERSION 3.10)
project(libpng C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
png.c
pngerror.c
pngget.c
pngmem.c
pngpread.c
pngread.c
pngrio.c
pngrtran.c
pngrutil.c
pngset.c
pngtrans.c
pngwio.c
pngwrite.c
pngwtran.c
pngwutil.c)
add_library(png STATIC ${SRC_FILES})
target_link_libraries(png z)
target_include_directories(png PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")

25
libz/CMakeLists.txt Normal file
View File

@ -0,0 +1,25 @@
cmake_minimum_required(VERSION 3.10)
project(libz C)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(SRC_FILES
adler32.c
compress.c
crc32.c
deflate.c
inffast.c
inflate.c
inftrees.c
testzlib.c
trees.c
uncompr.c
zutil.c)
add_library(z STATIC ${SRC_FILES})
target_include_directories(z PUBLIC
"${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}")