Changeset 2182 for trunk/cmake

Timestamp:

05/30/11 16:09:55 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: Yes/No?

JIRA Issue: No/Yes? List JIRA ticket.

Ready for Test: Yes/No?

Interface Changes: Yes/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...

Back to previous code except for appending new path to CMAKE_MODULE_PATH
variable instead of resetting it.

File:

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

trunk/cmake/withcasa.cmake

@@ -63 +63 @@
 
 # modules
-IF ( NOT DEFINED CASA_CODE_PATH )
-    IF ( EXISTS ${casaroot}/code/ )
-        set( CASA_CODE_PATH ${casaroot}/code )
-    ELSE()
-        set( CASA_CODE_PATH ${CMAKE_SOURCE_DIR}/../code )
-    ENDIF()
+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" )
 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} )