Add a nightly option to allow install of both vv and vv-nightly

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index c37c3f606bebc1cc2d3386b0a6227b90d324eabb..91b0a130a0ec368acb0ac3fef02266c1caf6ceb2 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -236,8 +236,8 @@ TARGET_LINK_LIBRARIES(vv vvLib)
 #=========================================================
 # Install options (also used by CPack)
 IF(UNIX OR APPLE)
-#   SET_TARGET_PROPERTIES(vv
-#     PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}")
+  SET_TARGET_PROPERTIES(vv
+    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}/lib")
   INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
   #  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)
 
@@ -267,7 +267,11 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
 SET(CPACK_PACKAGE_VERSION_MINOR "3")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
+IF(NIGHTLY)
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv-nightly")
+ELSE(NIGHTLY)
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv")
+ENDIF(NIGHTLY)
 SET(CPACK_STRIP_FILES TRUE)
 
 IF(WIN32)