Changeset 1960


Ignore:
Timestamp:
12/08/10 16:01:58 (13 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 CMakeLists.txt to depend libraries on DL, BLAS, and LAPACK.


Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/CMakeLists.txt

    r1958 r1960  
    4848endif()
    4949
     50set( CASACORE_DEFINITIONS ${CASACORE_DEFINITIONS}
     51  -DCASA_USECASAPATH
     52  -DCASACORE_NEEDS_RETHROW
     53  -DAIPS_STDLIB
     54  -DAIPS_AUTO_STL
     55  -D_GNU_SOURCE )
     56
     57if( CMAKE_SYSTEM_NAME STREQUAL Linux )
     58  set( CASACORE_DEFINITIONS ${CASACORE_DEFINITIONS}
     59    -D_FILE_OFFSET_BITS=64
     60    -D_LARGEFILE_SOURCE
     61    )
     62endif()
     63
     64add_definitions( ${CASACORE_DEFINITIONS} )
     65
    5066# environment dependent settings
    5167message( STATUS "CMAKE_SYSTEM = " ${CMAKE_SYSTEM} )
    … …  
    109125set( CMAKE_CXX_FLAGS ${DEFAULT_CXX_FLAGS} )
    110126
     127
     128#
    111129# DL
     130#
    112131set( DL_LIBRARIES ${CMAKE_DL_LIBS} CACHE STRING "dl libraries" FORCE )
    113132if( DL_LIBRARIES STREQUAL "dl" )
    … …  
    115134endif()
    116135message( STATUS "DL_LIBRARIES = " ${DL_LIBRARIES} )
     136
     137
     138#
     139# BLAS
     140#
     141find_library( BLAS_LIBRARIES libblas.${SO} )
     142message( STATUS "BLAS_LIBRARIES = " ${BLAS_LIBRARIES} )
     143
     144
     145#
     146# LAPACK
     147#
     148find_library( LAPACK_LIBRARIES liblapack.${SO} )
     149message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} )
     150
    117151
    118152#

  • trunk/apps/CMakeLists.txt

    r1959 r1960  
    1010
    1111# dependencies
    12 target_link_libraries( ${ASAP2TO3} ${CASACORE_LIBRARIES} )
     12target_link_libraries( ${ASAP2TO3}
     13                       ${CASACORE_LIBRARIES}
     14                       ${DL_LIBRARIES}
     15                       ${BLAS_LIBRARIES}
     16                       ${LAPACK_LIBRARIES} )
    1317
    1418# install

  • trunk/external-alma/atnf/CMakeLists.txt

    r1957 r1960  
    4545                       ${CASACORE_LIBRARIES}
    4646                       ${CFITSIO_LIBRARIES}
    47                        ${RPFITS_LIBRARIES} )
     47                       ${RPFITS_LIBRARIES}
     48                       ${DL_LIBRARIES}
     49                       ${BLAS_LIBRARIES}
     50                       ${LAPACK_LIBRARIES} )
    4851
    4952# install directory

  • trunk/external/libpyrap/CMakeLists.txt

    r1957 r1960  
    3131                       ${Boost_LIBRARIES}
    3232                       ${PYTHON_LIBRARIES}
    33                        ${CASACORE_LIBRARIES} )
     33                       ${CASACORE_LIBRARIES}
     34                       ${DL_LIBRARIES}
     35                       ${BLAS_LIBRARIES}
     36                       ${LAPACK_LIBRARIES} )
    3437
    3538# install directory
Note: See TracChangeset for help on using the changeset viewer.