Changeset 1991

Timestamp:

02/15/11 14:48:52 (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: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Reordering code.
The variable 'arch' must be set before CMAKE_INSTALL_PREFIX is examined.

File:

• trunk/cmake/withcasa.cmake (modified) (2 diffs)

trunk/cmake/withcasa.cmake

@@ -3 +3 @@
 ###
 
-
-# install directory
-# set casaroot
-# the regular expression means '../'
-#  [^ ] Matches any character(s) not inside the brackets
-#  +    Matches preceding pattern one or more times
-#  ?    Matches preceding pattern zero or once only
-#  $    Mathces at end of a line
-string( REGEX REPLACE /[^/]+/?$ "" casaroot ${CMAKE_SOURCE_DIR} )
-message( STATUS "casaroot = " ${casaroot} )
-
-# modules
-set( CMAKE_MODULE_PATH ${casaroot}/code/install )
-include( config )
-include( CASA )
 
 # environment dependent settings
@@ -57 +42 @@
 message( STATUS "arch = " ${arch} )
 
-# set root directory for installation
-set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} )
+# install directory
+#
+# The layout of the source+install directory trees
+# is rather hard-coded in much source code. However,
+# with care CASA can be built and installed elsewhere...
+#
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    # the regular expression means '../'
+    #  [^ ] Matches any character(s) not inside the brackets
+    #  +    Matches preceding pattern one or more times
+    #  ?    Matches preceding pattern zero or once only
+    #  $    Mathces at end of a line
+    string( REGEX REPLACE /[^/]+/?$ "" casaroot ${CMAKE_SOURCE_DIR} )
+    set( CMAKE_INSTALL_PREFIX ${casaroot}/${arch} )
+ELSE()
+    set( casaroot ${CMAKE_INSTALL_PREFIX}/.. )
+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 
+message( STATUS "casaroot = " ${casaroot} )
+
+# modules
+IF ( EXISTS ${casaroot}/code/install )
+    set( CMAKE_MODULE_PATH ${casaroot}/code/install )
+ELSE()
+    set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../code/install )
+ENDIF()
+
+
+include( config )
+include( CASA )
 
 #