Changeset 2093 for branches

Timestamp:

04/01/11 16:59:00 (13 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:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• cmake/withcasa.cmake (modified) (1 diff)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/cmake/withcasa.cmake

@@ -55 +55 @@
     #  $    Mathces at end of a line
     string( REGEX REPLACE /[^/]+/?$ "" casaroot ${CMAKE_SOURCE_DIR} )
-    set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} )
+    set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} CACHE PATH "casa architecture directory" FORCE )
 ELSE()
-    set( casaroot ${CMAKE_INSTALL_PREFIX}/.. )
+    set( casaroot ${CMAKE_INSTALL_PREFIX}/.. CACHE PATH "casa architecture directory" FORCE )
 ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)