From b1cba705b4b78c11337b2dcbd8a2d503e0d14dfe Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Mon, 30 May 2022 22:23:36 -0400 Subject: [PATCH] * BugFix: Fix missing link libraries for Linux. * BugFix: Fix calling a CMake function that was not available in the minimum Cmake version. --- Engine/source/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index ab407139f..1bd46e247 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -201,7 +201,7 @@ endif (TORQUE_OPENGL) # Linux requires X11 & freetype if (UNIX AND NOT APPLE) - set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} "X11" "Xft") + set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} "X11" "Xft" "dl" "pthread") set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_PLATFORM_X11_SOURCES}) find_package(Freetype REQUIRED) @@ -266,7 +266,7 @@ if (APPLE) endif (APPLE) if (UNIX AND NOT APPLE) - target_link_options(${TORQUE_APP_NAME} PUBLIC "-Wl,-rpath,./") + set_target_properties(${TORQUE_APP_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,./") endif (UNIX AND NOT APPLE) # Process link libraries for dynamic links - we do this on OSX/Linux to ensure the binaries end up in the correct App directory