Merge branch 'master' of github.com:cschreib/egg

Author: cschreib

cmake/FindWCSLib.cmake

@@ -37,11 +37,18 @@ if(NOT WCSLIB_FOUND)
   find_library(WCSLIB_LIBRARY wcs
     HINTS ${WCSLIB_ROOT_DIR} PATH_SUFFIXES lib)
   find_library(M_LIBRARY m)
-  mark_as_advanced(WCSLIB_INCLUDE_DIR WCSLIB_LIBRARY M_LIBRARY)
+
+  file(STRINGS "${WCSLIB_INCLUDE_DIR}/wcslib/wcsconfig.h" TLINE
+         REGEX "^#[\t ]*define[\t ]+WCSLIB_VERSION[\t ]+[0-9.]+$")
+
+  string(REGEX REPLACE "^^#[\t ]*define[\t ]+WCSLIB_VERSION[\t ]+([0-9.]+)$" "\\1"
+         WCSLIB_VERSION_STRING "${TLINE}")
+
+  mark_as_advanced(WCSLIB_INCLUDE_DIR WCSLIB_LIBRARY WCSLIB_VERSION_STRING M_LIBRARY)
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(WCSLIB DEFAULT_MSG
-    WCSLIB_LIBRARY M_LIBRARY WCSLIB_INCLUDE_DIR)
+    WCSLIB_LIBRARY M_LIBRARY WCSLIB_INCLUDE_DIR WCSLIB_VERSION_STRING)
 
   set(WCSLIB_INCLUDE_DIRS ${WCSLIB_INCLUDE_DIR})
   set(WCSLIB_LIBRARIES ${WCSLIB_LIBRARY} ${M_LIBRARY})

cmake/Findphypp.cmake

@@ -50,6 +50,9 @@ if(NOT PHYPP_FOUND)
         if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5))
             add_definitions(-Wno-old-style-cast)
         endif()
+        if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8))
+            add_definitions(-Wno-double-promote)
+        endif()
 
         add_definitions(-std=c++11)
         add_definitions(-ftemplate-backtrace-limit=0)
@@ -132,6 +135,10 @@ if(NOT PHYPP_FOUND)
     else()
         set(PHYPP_INCLUDE_DIRS ${PHYPP_INCLUDE_DIRS} ${WCSLIB_INCLUDE_DIRS})
         set(PHYPP_LIBRARIES ${PHYPP_LIBRARIES} ${WCSLIB_LIBRARIES})
+
+        if (WCSLIB_VERSION_STRING VERSION_LESS 5.0)
+            add_definitions(-DWCSLIB_NO_DIS)
+        endif()
     endif()
 
     # handle conditional FFTW support