From a311db2504a0a45eb3b237e8cf7d2181b5ea02a8 Mon Sep 17 00:00:00 2001 From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08> Date: Wed, 31 Mar 2010 11:56:42 +0000 Subject: [PATCH] added NO_RPATH option to executable git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1907 5a81b35b-ba03-0410-adc8-b2c5c5119f08 --- cmake_support/OST.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake index 7336319f2..534e9b34b 100644 --- a/cmake_support/OST.cmake +++ b/cmake_support/OST.cmake @@ -50,7 +50,8 @@ macro(parse_argument_list PREFIX ARG_NAMES OPT_NAMES) set(_CURR_ARG_NAME "${_ARG}") set(_CURR_ARG_LIST) else() - list(FIND OPT_NAMES ${_ARG} _IS_OPT_NAME) + set(_LOPT_NAMES ${OPT_NAMES}) + list(FIND _LOPT_NAMES ${_ARG} _IS_OPT_NAME) if (_IS_OPT_NAME GREATER -1) set(${PREFIX}_${_ARG} TRUE) else() @@ -257,12 +258,12 @@ endmacro() #------------------------------------------------------------------------------- macro(executable) parse_argument_list(_ARG - "NAME;SOURCES;LINK;DEPENDS_ON" "" ${ARGN}) + "NAME;SOURCES;LINK;DEPENDS_ON" "NO_RPATH" ${ARGN}) if (NOT _ARG_NAME) message(FATAL_ERROR "invalid use of executable(): a name must be provided") endif() add_executable(${_ARG_NAME} ${_ARG_SOURCES}) - if (APPLE) + if (APPLE AND NOT _ARG_NO_RPATH) set_target_properties(${_ARG_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,@loader_path/../lib") endif() -- GitLab