From 3ab0bc7c67b314658edf0a626df4f15e007cee92 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Thu, 9 May 2019 14:40:27 +0200 Subject: [PATCH] fix rpath/name_dir --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27329e5be..f724cd98f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,16 +149,6 @@ elseif(APPLE) set(CMAKE_MACOSX_RPATH ON) message(STATUS "RPATH support: ${CMAKE_MACOSX_RPATH}") - # TODO: check if(DEFINED) andfix macports -D - # fix install path - set(CMAKE_INSTALL_RPATH - "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}" CACHE - PATH "Library Install RPath" FORCE) - # force full path - set(CMAKE_INSTALL_NAME_DIR - "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}" CACHE - PATH "Library Install Name Destination Directory" FORCE) - configure_file("${CMAKE_SOURCE_DIR}/cmake/cpack/MacOSXBundleInfo.plist.in" "${CMAKE_BINARY_DIR}/Info.plist" @ONLY) elseif (WIN32) @@ -172,6 +162,16 @@ elseif (WIN32) set(OpenCV_LIBS="${EXTERNAL_LIBRARY_FOLDER}/opencv/opencv_ffmpeg410_64.dll") endif() +# TODO: check if(DEFINED) and fix macports -D +# fix install path +set(CMAKE_INSTALL_RPATH + "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}" CACHE + PATH "Library Install RPath" FORCE) +# force full path +set(CMAKE_INSTALL_NAME_DIR + "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}" CACHE + PATH "Library Install Name Destination Directory" FORCE) + # enable 24 bit receiving path if (RX_SAMPLE_24BIT) message(STATUS "Compiling for 24 bit Rx DSP chain")