Merge pull request #107 from casacore/issue105

Remove sofa from casacore, fixes #105

.travis.yml

@@ -18,6 +18,9 @@ install:
 
 
 before_script:
+  - wget http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz -O /tmp/sofa.tgz
+  - tar -xzf /tmp/sofa.tgz
+  - cd sofa/20150209_a/f77/src/ && make && make test && cd ../../../../
   - mkdir build
   - cd build
   - wget ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar
@@ -29,6 +32,7 @@ before_script:
       -DUSE_HDF5=ON
       -DBUILD_PYTHON=ON
       -DDATA_DIR=$PWD
+      -DSOFA_ROOT_DIR=$HOME
 
 script:
   - make -j4 

CMakeLists.txt

@@ -181,13 +181,13 @@ if (NOT ${MODULE} STREQUAL "casa")
         if (NOT ${MODULE} STREQUAL "measures")
             set (_modules ${_modules} fits)
             set (_usefits YES)
-	    if (${MODULE} STREQUAL "ms" OR ${MODULE} STREQUAL "all")
+            if (${MODULE} STREQUAL "ms" OR ${MODULE} STREQUAL "all")
                 set (_modules ${_modules} ms derivedmscal msfits)
-	    endif (${MODULE} STREQUAL "ms" OR ${MODULE} STREQUAL "all")
-	    if (${MODULE} STREQUAL "images" OR ${MODULE} STREQUAL "all")
+            endif (${MODULE} STREQUAL "ms" OR ${MODULE} STREQUAL "all")
+            if (${MODULE} STREQUAL "images" OR ${MODULE} STREQUAL "all")
                 set (_modules ${_modules} mirlib coordinates images)
                 set (_usewcs YES)
-	    endif (${MODULE} STREQUAL "images" OR ${MODULE} STREQUAL "all")
+            endif (${MODULE} STREQUAL "images" OR ${MODULE} STREQUAL "all")
         endif (NOT ${MODULE} STREQUAL "measures")
     endif (NOT ${MODULE} STREQUAL "tables")
 endif (NOT ${MODULE} STREQUAL "casa")
@@ -202,6 +202,7 @@ endif (BUILD_PYTHON)
 include (CTest)
 find_package (DL)
 find_package (Readline)
+find_package (SOFA)
 if (USE_HDF5)
     find_package (HDF5 REQUIRED)
 endif (USE_HDF5)
@@ -332,6 +333,7 @@ message (STATUS "Readline library? ..... = ${READLINE_LIBRARIES}")
 message (STATUS "BLAS library? ......... = ${BLAS_LIBRARIES}")
 message (STATUS "LAPACK library? ....... = ${LAPACK_LIBRARIES}")
 message (STATUS "WCS library? .......... = ${WCSLIB_LIBRARIES}")
+message (STATUS "SOFA library? ......... = ${SOFA_LIBRARIES}")
 message (STATUS "CFitsio library? ...... = ${CFITSIO_LIBRARIES}")
 message (STATUS "HDF5 library? ......... = ${HDF5_hdf5_LIBRARY}")
 message (STATUS "FFTW3 library? ........ = ${FFTW3_LIBRARIES}")
@@ -360,6 +362,7 @@ endif (BUILD_PYTHON)
 # List of possibly used external packages and where
 #  CFITSIO      fits
 #  WCSLIB       coordinates
+#  SOFA         measures (optional, only for testing)
 #  DL           casa (optional)
 #  READLINE     casa (optional)
 #  HDF5         casa (optional)

README.md

@@ -28,6 +28,7 @@ To compile casacore you need to meet the following requirements:
 * lapack
 * cfitsio (3.181 or later)
 * wcslib (4.20 or later)
+* sofa (optional, only for testing casacore measures)
 * fftw3 (optional)
 * hdf5 (optional)
 * numpy (optional)

cmake/FindSOFA.cmake

@@ -0,0 +1,21 @@
+# - Try to find SOFA: the IAU Standards of Fundamental Astronomy libraries
+# Variables used by this module:
+#  SOFA_ROOT_DIR     - SOFA root directory
+# Variables defined by this module:
+#  SOFA_FOUND        - system has SOFA
+#  SOFA_LIBRARY      - the SOFA library (cached)
+#  SOFA_LIBRARIES    - the SOFA libraries
+#                        (identical to SOFA_LIBRARY)
+
+if(NOT SOFA_FOUND)
+
+  find_library(SOFA_LIBRARY sofa
+    HINTS ${SOFA_ROOT_DIR} PATH_SUFFIXES lib)
+  mark_as_advanced(SOFA_LIBRARY)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(SOFA DEFAULT_MSG SOFA_LIBRARY)
+
+  set(SOFA_LIBRARIES ${SOFA_LIBRARY})
+
+endif(NOT SOFA_FOUND)

measures/CMakeLists.txt

@@ -50,7 +50,6 @@ Measures/Nutation.cc
 Measures/ParAngleMachine.cc
 Measures/Precession.cc
 Measures/Quality.cc
-Measures/SofaTest.cc
 Measures/SolarPos.cc
 Measures/Stokes.cc
 Measures/UVWMachine.cc
@@ -123,7 +122,6 @@ Measures/Nutation.h
 Measures/ParAngleMachine.h
 Measures/Precession.h
 Measures/Quality.h
-Measures/SofaTest.h
 Measures/SolarPos.h
 Measures/Stokes.h
 Measures/UVWMachine.h
@@ -159,7 +157,6 @@ DESTINATION include/casacore/measures
 )
 
 if (BUILD_TESTING)
-    add_subdirectory (fortran/sofa)
     add_subdirectory (Measures/test)
     add_subdirectory (TableMeasures/test)
 endif (BUILD_TESTING)

measures/Measures/test/CMakeLists.txt

@@ -27,8 +27,8 @@ foreach (test ${tests})
     add_test (${test} ${CMAKE_SOURCE_DIR}/cmake/cmake_assay ./${test})
 endforeach (test)
 
-foreach (test tIAU2000)
-    add_executable (tIAU2000 tIAU2000.cc)
-    target_link_libraries (tIAU2000 casa_measures sofa)
-    add_test (${test} ${CMAKE_SOURCE_DIR}/cmake/cmake_assay ./${test})
-endforeach (test)
+if (SOFA_FOUND)
+    add_executable (tIAU2000 SofaTest.cc tIAU2000.cc)
+    target_link_libraries (tIAU2000 casa_measures ${SOFA_LIBRARY})
+    add_test (tIAU2000 ${CMAKE_SOURCE_DIR}/cmake/cmake_assay ./tIAU2000)
+endif (SOFA_FOUND)

measures/Measures/SofaTest.cc → measures/Measures/test/SofaTest.cc

@@ -26,7 +26,7 @@
 //# $Id$
 
 //# Include files
-#include <casacore/measures/Measures/SofaTest.h>
+#include "SofaTest.h"
 #include <casacore/casa/BasicMath/Math.h>
 #include <casacore/casa/iostream.h>
 #include <limits.h>

measures/Measures/test/tIAU2000.cc

@@ -26,7 +26,6 @@
 //# $Id$
 
 #include <casacore/casa/aips.h>
-#include <casacore/measures/Measures/SofaTest.h>
 #include <casacore/casa/Arrays/ArrayMath.h>
 #include <casacore/casa/Arrays/ArrayIO.h>
 #include <casacore/casa/Arrays/Vector.h>
@@ -48,6 +47,8 @@
 #include <casacore/casa/BasicSL/String.h>
 #include <casacore/casa/iostream.h>
 
+#include "SofaTest.h"
+
 #include <casacore/casa/namespace.h>
 // Print separation line of given (default 75) length
 void SEPAR(const uInt l=75) {