]> Creatis software - clitk.git/commitdiff
Remove manual RPATH settings
authorVivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Mon, 4 Mar 2013 15:26:14 +0000 (16:26 +0100)
committerVivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Mon, 4 Mar 2013 15:26:14 +0000 (16:26 +0100)
- RPATH are set in the main CMakeLists.txt by this line:
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

registration/CMakeLists.txt
segmentation/CMakeLists.txt
tools/CMakeLists.txt
vv/CMakeLists.txt

index 64b55dccfa0e71a6b33e3be2e333980bf52db9a9..1bf1bf5796824bcb03dda629fd1f898580f7a618 100644 (file)
@@ -44,7 +44,6 @@ IF(CLITK_BUILD_REGISTRATION)
     TARGET_LINK_LIBRARIES(clitkConvertBSplineDeformableTransformToVF clitkCommon  ${ITK_LIBRARIES})
     SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkConvertBSplineDeformableTransformToVF)
 
-#    SET_TARGET_PROPERTIES(${REGISTRATION_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
     INSTALL (TARGETS ${REGISTRATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
 
 ENDIF(CLITK_BUILD_REGISTRATION)
index 2e1ddac611cb2cf9ce1aef94770b71509641cd6d..64adbd9a1891ed995a7ffabd09fcd8643cf5dcdd 100644 (file)
@@ -50,7 +50,6 @@ IF(CLITK_BUILD_SEGMENTATION)
     ADD_EXECUTABLE(clitkRegionGrowing clitkRegionGrowing.cxx ${clitkRegionGrowing_GGO_C} ${clitkRelativePosition_GGO_C})
     TARGET_LINK_LIBRARIES(clitkRegionGrowing clitkCommon ${ITK_LIBRARIES})
 
-#    SET_TARGET_PROPERTIES(${SEGMENTATION_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
     INSTALL (TARGETS ${SEGMENTATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
 
 ENDIF(CLITK_BUILD_SEGMENTATION)
index 71937728a25aea7f049db5e22bf1a9dbed95b14e..e6b57d34f78108685daf4e7a0ead5b4b48cd9c8f 100644 (file)
@@ -268,7 +268,6 @@ IF (CLITK_BUILD_TOOLS)
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTPlan2Gate)
   ENDIF(ITK_VERSION_MAJOR VERSION_LESS 4)
 
-#   SET_TARGET_PROPERTIES(${TOOLS_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
   INSTALL (TARGETS ${TOOLS_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 ENDIF(CLITK_BUILD_TOOLS)
index 91b0a130a0ec368acb0ac3fef02266c1caf6ceb2..1fbbe282a15b63648ffb8b829df184b88f192e52 100644 (file)
@@ -236,8 +236,6 @@ 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}/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 .)