X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;fp=CMakeLists.txt;h=b0f1d013f5fd847de6e4b04f21e338bf1c5e5162;hb=43d2201f502b383678bc1ad3ad740cfc8dfdfe07;hp=9159a9803347e42b73364f3f92b73cab1058f3ab;hpb=9d605d309f7d7fe5d19c76cc1b039cc4c0a9b13e;p=xonotic%2Fnetradiant.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9159a980..b0f1d013 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,9 @@ if (BUILD_RADIANT OR BUILD_TOOLS)
 endif ()
 
 if (BUILD_BINARIES)
-    if (WIN32 OR APPLE OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    if (WIN32 OR APPLE
+        OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"
+        OR "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" )
         set(BUNDLING_SUPPORTED ON)
     endif()
 
@@ -385,8 +387,12 @@ if (BUILTIN_GTKGLEXT)
     set_target_properties(gtkglext PROPERTIES EXCLUDE_FROM_ALL ON)
 endif ()
 
-if (BUNDLE_LIBRARIES AND EXISTS ${BUILTINS_LIB_DIR})
-    set(CMAKE_SKIP_BUILD_RPATH ON)
+if (BUNDLE_LIBRARIES)
+    # It was required to tell cmake to not patch rpath on macos builtins.
+    # It was also required to tell cmake to not patch rpath on freebsd binaries.
+    # Patching rpath is done in library_bundler instead so we can skip this
+    # step entirely when bundling.
+    set(CMAKE_SKIP_RPATH ON)
 endif()
 
 if (BUILTIN_GTKTHEME_MOJAVE)