[Teem-commit] teem CMakeLists.txt,1.25,1.26

[James B. <bi...@us...>]

Update of /cvsroot/teem/teem
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9356

Modified Files:
	CMakeLists.txt 
Log Message:
Updated INSTALL commands to the new CMake v. 2.4 version.  Added rpath goodness for shared library build installations.

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/teem/teem/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CMakeLists.txt	10 Oct 2007 21:23:31 -0000	1.25
--- CMakeLists.txt	31 Oct 2007 19:31:26 -0000	1.26
***************
*** 239,242 ****
--- 239,262 ----
  ADD_LIBRARY(teem ${TEEM_SOURCES})
  
+ # Set up some library paths for installation.
+ IF(APPLE)
+   # In OSX, they treat library paths a little differntly than on
+   # linux.  The path to the library can be encoded in the library.
+   # Any code linking to this library will look for the library in the
+   # path specified by this path.  What this means for us, is that you
+   # can't use the library easily until you install it.
+   SET_TARGET_PROPERTIES(teem PROPERTIES
+     BUILD_WITH_INSTALL_RPATH ON
+     INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
+     )
+ ELSE(APPLE)
+   # Windows will ingore the RPATH stuff, so other unix based systems
+   # with rpath support will do the right thing.
+   SET_TARGET_PROPERTIES(teem PROPERTIES
+     BUILD_WITH_INSTALL_RPATH OFF
+     INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+     )
+ ENDIF(APPLE)
+ 
  IF(TEEM_BZIP2_LIB)
    TARGET_LINK_LIBRARIES(teem ${TEEM_BZIP2_LIB})
***************
*** 253,257 ****
  ENDIF(UNIX)
  
! INSTALL_TARGETS(/lib teem)
  
  # Now compile the binaries
--- 273,280 ----
  ENDIF(UNIX)
  
! INSTALL(TARGETS teem
!   LIBRARY DESTINATION lib
!   ARCHIVE DESTINATION lib
!   )
  
  # Now compile the binaries
***************
*** 323,332 ****
    "${TEEM_BINARY_DIR}/CMake/TEEMConfig.cmake" @ONLY IMMEDIATE)
  
! INSTALL_FILES(/include/teem FILES ${TEEM_INSTALLED_HEADER_FILES})
! INSTALL_FILES(/lib/TEEM-${TEEM_VERSION_STRING} FILES
    "${TEEM_SOURCE_DIR}/CMake/TEEMUse.cmake"
    "${TEEM_BINARY_DIR}/TEEMBuildSettings.cmake"
    "${TEEM_BINARY_DIR}/TEEMLibraryDepends.cmake"
    "${TEEM_BINARY_DIR}/CMake/TEEMConfig.cmake"
    )
  
--- 346,358 ----
    "${TEEM_BINARY_DIR}/CMake/TEEMConfig.cmake" @ONLY IMMEDIATE)
  
! INSTALL(FILES ${TEEM_INSTALLED_HEADER_FILES}
!   DESTINATION include/teem
!   )
! INSTALL(FILES
    "${TEEM_SOURCE_DIR}/CMake/TEEMUse.cmake"
    "${TEEM_BINARY_DIR}/TEEMBuildSettings.cmake"
    "${TEEM_BINARY_DIR}/TEEMLibraryDepends.cmake"
    "${TEEM_BINARY_DIR}/CMake/TEEMConfig.cmake"
+   DESTINATION lib/TEEM-${TEEM_VERSION_STRING}
    )