From 5d544d252393523baf4bbcc4e300d20b4b6652d4 Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Mon, 4 Mar 2013 16:26:14 +0100 Subject: [PATCH 1/1] Remove manual RPATH settings - RPATH are set in the main CMakeLists.txt by this line: SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) --- registration/CMakeLists.txt | 1 - segmentation/CMakeLists.txt | 1 - tools/CMakeLists.txt | 1 - vv/CMakeLists.txt | 2 -- 4 files changed, 5 deletions(-) diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt index 64b55dc..1bf1bf5 100644 --- a/registration/CMakeLists.txt +++ b/registration/CMakeLists.txt @@ -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) diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt index 2e1ddac..64adbd9 100644 --- a/segmentation/CMakeLists.txt +++ b/segmentation/CMakeLists.txt @@ -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) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 7193772..e6b57d3 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -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) diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 91b0a13..1fbbe28 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -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 .) -- 2.46.1