[med-svn] [Git][med-team/fast][master] Attempt to turn off RPATH

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
8c054501 by Shayan Doust at 2019-08-21T04:20:02Z
Attempt to turn off RPATH

- - - - -


1 changed file:

- debian/patches/modify_libs_and_output.patch


Changes:

=====================================
debian/patches/modify_libs_and_output.patch
=====================================
@@ -5,8 +5,8 @@ Author: Shayan Doust <hello at shayandoust.me>
 
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-08-19 13:45:54.125541311 +0100
-+++ fast/CMakeLists.txt	2019-08-19 13:46:54.290033490 +0100
+--- fast.orig/CMakeLists.txt	2019-08-21 04:18:49.220804478 +0100
++++ fast/CMakeLists.txt	2019-08-21 04:19:26.697111063 +0100
 @@ -34,7 +34,7 @@
  option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
  option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
@@ -16,7 +16,7 @@ Index: fast/CMakeLists.txt
  
  # Python version
  set(FAST_Python_Version "" CACHE STRING "Specify which Python version to build python wrappers with. E.g. 2 or 3")
-@@ -157,10 +157,15 @@
+@@ -157,10 +157,19 @@
  
  #### Create FAST library and executables
  add_library(FAST SHARED ${FAST_SOURCE_FILES} ${HEADERS_MOC})
@@ -28,12 +28,16 @@ Index: fast/CMakeLists.txt
  
 +
 +set_target_properties(FAST-STATIC PROPERTIES OUTPUT_NAME FAST CLEAN_DIRECT_OUTPUT 1)
-+set_target_properties(FAST PROPERTIES OUTPUT_NAME FAST SOVERSION 0 CLEAN_DIRECT_OUTPUT 1)
++set_target_properties(FAST PROPERTIES SKIP_BUILD_RPATH TRUE OUTPUT_NAME FAST SOVERSION 0 CLEAN_DIRECT_OUTPUT 1)
++
++SET(CMAKE_SKIP_BUILD_RPATH TRUE)
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
++SET(CMAKE_INSTALL_RPATH "")
 +
  include(cmake/OpenMP.cmake)
  
  ## Link everything
-@@ -170,6 +175,18 @@
+@@ -170,6 +179,18 @@
      qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
  endif()
  
@@ -52,7 +56,7 @@ Index: fast/CMakeLists.txt
  ## Build test executable
  if(FAST_BUILD_TESTS)
      add_executable(testFAST ${FAST_TEST_SOURCE_FILES} source/FAST/Algorithms/CoherentPointDrift/Rigid.cpp source/FAST/Algorithms/CoherentPointDrift/Rigid.hpp source/FAST/Algorithms/CoherentPointDrift/Affine.cpp source/FAST/Algorithms/CoherentPointDrift/Affine.hpp)
-@@ -243,5 +260,8 @@
+@@ -243,5 +264,8 @@
      include(cmake/FASTCustomCommands.cmake)
  endif(NOT FAST_BUILD_QT5 AND WIN32)
  



View it on GitLab: https://salsa.debian.org/med-team/fast/commit/8c0545018740760c00ed9a3a7e7ff34845267b01

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/commit/8c0545018740760c00ed9a3a7e7ff34845267b01
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190822/2a442f42/attachment-0001.html>