Changeset 1976 for trunk

Timestamp:

01/24/11 17:35:25 (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...

Changes from Wes and Darrell.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/withcasa.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -515 +515 @@
 set( PYTHON_INSTALL_DIR python/${PYTHONV}/asap )
 set( SHARED_INSTALL_DIR share/asap )
+# Add the modules to be built.
+#
+# Choose to have correct RPATHs both in the build tree and
+# in the install tree (at the cost of having to change the
+# rpath when installing)
+#
+set( CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib )
+set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib )
+
 
 

trunk/cmake/withcasa.cmake

@@ -64 +64 @@
 # casacore
 #
-set( CASACORE_PATHS "${casaroot}/${arch};/usr/local;/usr" )
+set( CASACORE_PATHS "${casaroot}/${arch};${casaroot};/usr/local;/usr" )