Changeset 1963 for trunk

Timestamp:

12/14/10 13:15:13 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2668

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Updated along with Jonas's recommendation.
Added result check for lapack, blas.

File:

• trunk/CMakeLists.txt (modified) (11 diffs)

trunk/CMakeLists.txt

@@ -140 +140 @@
 #
 find_library( BLAS_LIBRARIES libblas.${SO} )
+if ( BLAS_LIBRARIES MATCHES "NOTFOUND$" )
+   message( FATAL_ERROR "blas could not be found. Please check!" )
+endif()
 message( STATUS "BLAS_LIBRARIES = " ${BLAS_LIBRARIES} )
 
@@ -147 +150 @@
 #
 find_library( LAPACK_LIBRARIES liblapack.${SO} )
+if ( LAPACK_LIBRARIES MATCHES "NOTFOUND$" )
+   message( FATAL_ERROR "lapack could not be found. Please check!" )
+endif()
 message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} ) 
 
@@ -159 +165 @@
               HINTS ${casaroot}/${arch}/include/
               PATH_SUFFIXES casacore ) 
-   if( CASACORE_INCLUDE_DIR STREQUAL CASACORE_INCLUDE_DIR-NOTFOUND )
+   if( CASACORE_INCLUDE_DIR MATCHES "NOTFOUND$" )
      message( FATAL_ERROR "${_includename} could not be found. Please check!" )
    endif()
@@ -181 +187 @@
       find_library( _casacore_lib ${_libname}
                     PATHS ${CMAKE_INSTALL_PREFIX} PATH_SUFFIXES lib )
-      if( NOT _casacore_lib-NOTFOUND )
+      if( _casacore_lib MATCHES "NOTFOUND$" )
+         message( FATAL_ERROR "${_libname} could not be found. Please check!" )
+      else()
          #list( APPEND _casacore_libs casa_${_a} )
          list( APPEND _casacore_libs ${_casacore_lib} )
@@ -191 +199 @@
    set( _libname libcasacore.${SO} )
    find_library( CASACORE_LIBRARIES ${_libname} )
-   if( CASACORE_LIBRARIES STREQUAL CASACORE_LIBRARIES-NOTFOUND )
+   if( CASACORE_LIBRARIES MATCHES "NOTFOUND$" )
       message( FATAL_ERROR "${_libname} could not be found. Please check!" )
    endif()
@@ -197 +205 @@
    find_path( CASACORE_INCLUDE_DIR ${_includename} 
               PATH_SUFFIXES casacore ) 
-   if( CASACORE_INCLUDE_DIR STREQUAL CASACORE_INCLUDE_DIR-NOTFOUND )
+   if( CASACORE_INCLUDE_DIR MATCHES "NOTFOUND$" )
      message( FATAL_ERROR "${_includename} could not be found. Please check!" )
    endif()
@@ -322 +330 @@
            CPP_VERSION CFITSIO_VERSION
            RUN_VERSION "(ffvers(&v), v)" )
-if( NOT CFITSIO_FOUND )
-   message( FATAL_ERROR "CFITSIO could not be found. Please check!" )
-endif()
+#if( NOT CFITSIO_FOUND )
+#   message( FATAL_ERROR "CFITSIO could not be found. Please check!" )
+#endif()
 message( STATUS "CFITSIO_INCLUDE_DIRS = " ${CFITSIO_INCLUDE_DIRS} )
 message( STATUS "CFITSIO_LIBRARIES = " ${CFITSIO_LIBRARIES} )
@@ -336 +344 @@
 find_library( WCSLIB ${_wcslib} 
               HINTS /usr/lib64 /usr/lib ${casaroot}/${arch}/lib )
-if( WCSLIB STREQUAL WCSLIB-NOTFOUND )
+if( WCSLIB MATCHES "NOTFOUND$" )
    message( STATUS "${_wcslib} could not be found." )
    unset( _wcslib CACHE )
@@ -344 +352 @@
    find_library( WCSLIB ${_wcslib} 
                  HINTS /usr/lib64 /usr/lib ${casaroot}/${arch}/lib )
-   if( WCSLIB STREQUAL WCSLIB-NOTFOUND )
+   if( WCSLIB MATCHES "NOTFOUND$" )
       message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
    endif()
@@ -351 +359 @@
 find_path( WCSLIB_INCLUDE_DIR wcslib/wcs.h
            HINTS /usr/include ${casaroot}/${arch}/include )
-if( WCSLIB_INCLUDE_DIR STREQUAL WCSLIB_INCLUDE_DIR-NOTFOUND )
+if( WCSLIB_INCLUDE_DIR MATCHES "NOTFOUND$" )
    message( FATAL_ERROR "wcs.h could not be found. Please check!" )
 endif()
@@ -410 +418 @@
   DEPENDS FORTRAN 
 )
-if( NOT RPFITS_FOUND )
-   message( FATAL_ERROR "${_wcslib} could not be found. Please check!" )
-endif()
+#if( NOT RPFITS_FOUND )
+#   message( FATAL_ERROR "rpfits could not be found. Please check!" )
+#endif()
 message( STATUS "RPFITS_INCLUDE_DIRS = " ${RPFITS_INCLUDE_DIRS} )
 message( STATUS "RPFITS_LIBRARIES = " ${RPFITS_LIBRARIES} )