From c485dafbbd4505e6028625a70c75e0eee7388cfe Mon Sep 17 00:00:00 2001 From: Samuel Nicholas Date: Sun, 29 Dec 2024 10:53:14 +1030 Subject: [PATCH] Update Target Properties - Using rpath for a static library is irrelevant, needs to be seet in consumers. - Add INTERFACE_POSITION_INDEPENDENT_CODE to propogate flag to consumers. --- cmake/godotcpp.cmake | 3 ++- test/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/godotcpp.cmake b/cmake/godotcpp.cmake index 74ce940e..76623378 100644 --- a/cmake/godotcpp.cmake +++ b/cmake/godotcpp.cmake @@ -307,8 +307,9 @@ function( godotcpp_generate ) CXX_VISIBILITY_PRESET ${GODOT_SYMBOL_VISIBILITY} COMPILE_WARNING_AS_ERROR ${GODOT_WARNING_AS_ERROR} + POSITION_INDEPENDENT_CODE ON - BUILD_RPATH_USE_ORIGIN ON + INTERFACE_POSITION_INDEPENDENT_CODE ON PREFIX lib OUTPUT_NAME "${PROJECT_NAME}.${SYSTEM_NAME}.${TARGET_ALIAS}${DEV_TAG}.${SYSTEM_ARCH}" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 263de22b..14f22591 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -52,7 +52,7 @@ foreach( TARGET_ALIAS template_debug template_release editor ) CXX_EXTENSIONS OFF CXX_VISIBILITY_PRESET ${GODOT_SYMBOL_VISIBILITY} - POSITION_INDEPENDENT_CODE ON + # This flag adds the runtime path at build time BUILD_RPATH_USE_ORIGIN ON # Try to ensure only static libraries are selected to be linked to.