Changeset 2183 for trunk/cmake

Timestamp:

05/30/11 16:34:36 (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: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Added CASA_CODE_PATH option in asap cmake system.
It specifies where CASA code tree is checked out.
By default, CASA_CODE_PATH is set to $CASAROOT/code or
$CMAKE_SOURCE_DIR/../code depending on an existence of
$CASAROOT/code/install directory.

File:

• trunk/cmake/withcasa.cmake (modified) (1 diff)

trunk/cmake/withcasa.cmake

@@ -63 +63 @@
 
 # modules
-IF ( EXISTS ${casaroot}/code/install )
-    set( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${casaroot}/code/install" )
-ELSE()
-    set( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/../code/install" )
+IF ( NOT DEFINED CASA_CODE_PATH )
+    IF ( EXISTS ${casaroot}/code/install )
+        set( CASA_CODE_PATH ${casaroot}/code )
+    ELSE()
+        set( CASA_CODE_PATH ${CMAKE_SOURCE_DIR}/../code )
+    ENDIF()
 ENDIF()
+message( STATUS "CASA_CODE_PATH = " ${CASA_CODE_PATH} )
+set( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CASA_CODE_PATH}/install" )
+#unset( CASA_CODE_PATH CACHE )
 message( STATUS "CMAKE_MODULE_PATH = " ${CMAKE_MODULE_PATH} )