Skip to content

Commit 01579d3

Browse files
committed
Merge branch 'master' of github.com:cschreib/egg
2 parents a28d957 + fe983e0 commit 01579d3

File tree

4 files changed

+46
-2
lines changed

4 files changed

+46
-2
lines changed

CHANGELOG

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
v1.0.8
2+
======
3+
4+
Bug fixes:
5+
- Fixed a compilation error with recent versions of CFITSIO (CURL dependency).
6+
7+
8+
v1.0.7
9+
======
10+
11+
New/updated features:
12+
- Added Av as an output of the simulation.
13+
14+
Bug fixes:
15+
- Added sanity checks for input filters.
16+
17+
18+
v1.0.6
19+
======
20+
21+
New/updated features:
22+
- Added JWST and ALMA filters.
23+
24+
Changes in EGG recipes:
25+
- The mass functions can now reach z=15, however this is a wild extrapolation!
26+
- The recipes for Tdust and IR8 have been updated to the relations published in Schreiber et al. (2018).
27+
28+
Bug fixes:
29+
- Fixed documentation for 'filter_db' parameter.
30+
- Fixed issues with WCSLib and distortion in FITS headers.
31+
32+
133
v1.0.5
234
======
335

cmake/FindCFITSIO.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ if (NOT CFITSIO_FOUND)
5050
PATH_SUFFIXES lib
5151
)
5252

53+
##_____________________________________________________________________________
54+
## Check for CURL dependency
55+
56+
find_package(CURL)
57+
5358
##_____________________________________________________________________________
5459
## Actions taken when all components have been found
5560

@@ -67,9 +72,16 @@ if (NOT CFITSIO_FOUND)
6772
endif (NOT CFITSIO_FIND_QUIETLY)
6873
endif (CFITSIO_INCLUDES AND CFITSIO_LIBRARIES)
6974

75+
if (CURL_FOUND)
76+
list(APPEND CFITSIO_LIBRARIES ${CURL_LIBRARIES})
77+
endif (CURL_FOUND)
78+
7079
if (CFITSIO_FOUND)
7180
if (NOT CFITSIO_FIND_QUIETLY)
7281
message (STATUS "Found components for CFITSIO")
82+
if (CURL_FOUND)
83+
message (STATUS "HTTPS support (CURL)")
84+
endif (CURL_FOUND)
7385
message (STATUS "CFITSIO_INCLUDES = ${CFITSIO_INCLUDES}")
7486
message (STATUS "CFITSIO_LIBRARIES = ${CFITSIO_LIBRARIES}")
7587
endif (NOT CFITSIO_FIND_QUIETLY)

doc/scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ INSTALL_ROOT_DIR=""
4242
CFITSIO_VERSION="_latest"
4343
WCSLIB_VERSION=""
4444
PHYPP_VERSION="master"
45-
EGG_VERSION="v1.0.5"
45+
EGG_VERSION="v1.0.8"
4646

4747

4848
# -----------------------------------------

src/egg-gencat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ void print_help() {
17551755
}
17561756
};
17571757

1758-
print("egg-gencat v1.0.7");
1758+
print("egg-gencat v1.0.8");
17591759
print("usage: egg-gencat [options]\n");
17601760

17611761
print("List of generic options:");

0 commit comments

Comments
 (0)