VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

fixes install path

Browse Source
This commit is contained in:
Davide Gerhard 2019-05-07 09:57:08 +02:00
parent d277e55e48
commit acde7a0bd6
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -375,9 +375,21 @@ if (BUILD_SERVER)
endif() endif()
############ install ################## ############ install ##################
if(NOT CMAKE_INSTALL_RPATH)
set(CMAKE_INSTALL_RPATH
${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR} CACHE
PATH "Library Install RPath" FORCE)
endif()
# force full path
if(APPLE AND NOT CMAKE_INSTALL_NAME_DIR)
set(CMAKE_INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR} CACHE
PATH "Library Install Name Destination Directory" FORCE)
endif()
install(TARGETS sdrangelbench DESTINATION ${INSTALL_BIN_DIR}) install(TARGETS sdrangelbench DESTINATION ${INSTALL_BIN_DIR})
if (BUILD_GUI) if (BUILD_GUI)
#AND (APPLE AND NOT BUNDLE))
install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${INSTALL_BIN_DIR}) install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION ${INSTALL_BIN_DIR})
endif() endif()
if (BUILD_SERVER) if (BUILD_SERVER)
@ -428,16 +440,16 @@ if(APPLE AND BUNDLE AND BUILD_GUI)
# -appstore-compliant # -appstore-compliant
# -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangel\" # -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangel\"
# -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangelsrv\" # -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangelsrv\"
# -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangelbench\" # -executable=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/sdrangelbench\")"
# -libpath=\"${CMAKE_BINARY_DIR}/${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")" # -libpath=\"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")"
# # -libpath=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}\")" # # -libpath=\"\${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}\")"
# COMPONENT applications) # COMPONENT applications)
# INSTALL(CODE " INSTALL(CODE "
# SET(BU_COPY_FULL_FRAMEWORK_CONTENTS ON) SET(BU_COPY_FULL_FRAMEWORK_CONTENTS ON)
# include(BundleUtilities) include(BundleUtilities)
# fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../../../${CPACK_BUNDLE_NAME}.app\" \"\" \"/opt/local/lib;/usr/local/lib\") fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../../../${CPACK_BUNDLE_NAME}.app\" \"\" \"/opt/local/lib;/usr/local/lib\")
# " COMPONENT Runtime) " COMPONENT Runtime)
elseif(LINUX AND BUNDLE) elseif(LINUX AND BUNDLE)