From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Mon, 4 Mar 2013 15:03:11 +0000 (+0100)
Subject: Add a nightly option to allow install of both vv and vv-nightly
X-Git-Tag: v1.4.0~242^2~2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=5a84580b9263ac5ee2ab846f3113e325a7e0c37f;hp=674ad0ff12d7c7e888c928849745952249aa7910;p=clitk.git

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

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index c37c3f6..91b0a13 100644
--- 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)