epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundle: OSX use -rpath for bundled libevent

Browse Source
This commit is contained in:
Michael Davidsaver
2022-12-27 09:28:22 -08:00
parent 6b63e14140
commit c8f28f373a
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle/Makefile
+3 -1
View File
@@ -30,6 +30,8 @@ CMAKEFLAGS += -DEVENT__DISABLE_SAMPLES=ON
CMAKEFLAGS += -DEVENT__DISABLE_TESTS=ON
CMAKEFLAGS += -DEVENT__DISABLE_BENCHMARK=ON
CMAKEFLAGS += -DCMAKE_MACOSX_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=OFF
# searched for toolchain files
CMAKEFLAGS += -DCMAKE_MODULE_PATH:DIR="$(abspath $(TOP)/bundle/cmake)"
@@ -120,7 +122,7 @@ ifneq (,$(filter %mingw,$(T_A)))
ifeq (NO,$(SHARED_LIBRARIES))
$(CP) $(LIBEVENT_$(T_A))/lib/libevent_core.a $(LIBEVENT_$(T_A))/lib/event_core.lib
# HACK: when STATIC_BUILD=YES we (in configure/RULES_PVXS_MODULE) inject the event_core
# dependency via <target>_LIBS += event_core which requires end existance of
# dependency via <target>_LIBS += event_core which requires the existance of
# $(event_core_DIR)/event_core.lib however, cmake outputs the *nix style name
# libevent_core.a (probably because it can coexist with the dll import library
# named libevent_core.dll.a).