Ignore:
Timestamp:
04/01/11 16:59:00 (14 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: run cmake several times

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Merge changes in trunk (r2092).

Location:
branches/casa-prerelease/pre-asap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/casa-prerelease/pre-asap

    • Property svn:mergeinfo changed
      /trunkmerged: 2092
  • branches/casa-prerelease/pre-asap/cmake/withcasa.cmake

    r1991 r2093  
    5555    #  $    Mathces at end of a line
    5656    string( REGEX REPLACE /[^/]+/?$ "" casaroot ${CMAKE_SOURCE_DIR} )
    57     set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} )
     57    set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} CACHE PATH "casa architecture directory" FORCE )
    5858ELSE()
    59     set( casaroot ${CMAKE_INSTALL_PREFIX}/.. )
     59    set( casaroot ${CMAKE_INSTALL_PREFIX}/.. CACHE PATH "casa architecture directory" FORCE )
    6060ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    6161
Note: See TracChangeset for help on using the changeset viewer.