From fbdc9862a736e827d2d068da516cef2983aa7ed8 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Fri, 26 Sep 2025 13:08:05 -0500 Subject: [PATCH] Make rpath togglable --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 082193f..e1c05ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ option(CROSSLANG_SHARED_EXECUTABLES "Link with libcrosslang_shared" ON) option(CROSSLANG_FETCHCONTENT "Use fetchcontent" ON) option(CROSSLANG_ENABLE_CONFIG_ENVVAR "Allow setting config directory via the environment variable CROSSLANG_CONFIG" ON) option(CROSSLANG_ENABLE_FFI "Enable libffi" OFF) - +option(CROSSLANG_ENABLE_RPATH "Enable RPATH" ON) option(CROSSLANG_CUSTOM_CONSOLE "Enable custom Console" OFF) @@ -52,7 +52,9 @@ endif() if(NOT TESSESFRAMEWORK_ENABLE_STATIC) set(CROSSLANG_ENABLE_STATIC OFF) endif() - +if(NOT TESSESFRAMEWORK_ENABLE_RPATH) +set(CROSSLANG_ENABLE_RPATH OFF) +endif() #set(CROSSLANG_ENABLE_SHARED OFF) #set(TESSESFRAMEWORK_ENABLE_SHARED OFF) @@ -258,12 +260,15 @@ endif() if(CROSSLANG_ENABLE_BINARIES) if(CROSSLANG_ENABLE_SHARED AND CROSSLANG_SHARED_EXECUTABLES) +if(CROSSLANG_ENABLE_RPATH) set(CMAKE_MACOSX_RPATH 1) +set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE) if (APPLE) set(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") else() set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") endif() +endif() add_executable(crossmerge src/crossmergecli.cpp ${CROSSLANG_WIN32_EXE_SRC}) add_executable(crossasm src/crossasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC}) add_executable(crossdisasm src/crossdisasmcli.cpp ${CROSSLANG_WIN32_EXE_SRC})