From 757e994eaa8b4ebf276ae5901668bee1110c8d7f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 7 Jan 2016 17:21:50 -0800 Subject: [PATCH] Fixed --enable-new-dtags check with cmake --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c0b749166334..9cf7aab3c2b30 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -957,12 +957,13 @@ elseif(UNIX AND NOT APPLE) if(RPATH) set(SDL_RLD_FLAGS "") if(BSDI OR FREEBSD OR LINUX OR NETBSD) - set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir}") set(CMAKE_REQUIRED_FLAGS "-Wl,--enable-new-dtags") check_c_compiler_flag("" HAVE_ENABLE_NEW_DTAGS) set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) if(HAVE_ENABLE_NEW_DTAGS) - list(APPEND SDL_RLD_FLAGS "-Wl,--enable-new-dtags") + set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir} -Wl,--enable-new-dtags") + else() + set(SDL_RLD_FLAGS "-Wl,-rpath,\${libdir}") endif() elseif(SOLARIS) set(SDL_RLD_FLAGS "-R\${libdir}")