From: Thomas Debesse <dev@illwieckz.net>
Date: Thu, 1 Aug 2019 22:28:49 +0000 (+0200)
Subject: cmake: BUNDLE_LIBRARIES disables FHS_INSTALL
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fcd313bf409fb695dc403331370896f0b8e62a30;p=xonotic%2Fnetradiant.git

cmake: BUNDLE_LIBRARIES disables FHS_INSTALL
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7be16fb3..d3e0d8b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
 set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
 set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "...")
 
-if (FHS_INSTALL)
+if (FHS_INSTALL AND NOT BUNDLE_LIBRARIES)
     set(RADIANT_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/${RADIANT_BASENAME})
     set(RADIANT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
     set(RADIANT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${RADIANT_BASENAME})
@@ -221,6 +221,8 @@ if (BUILD_BINARIES)
 
     if (BUNDLE_LIBRARIES)
         add_subdirectory(bundle)
+
+        set(FHS_INSTALL OFF CACHE PATH "Disabled because of BUNDLE_LIBRARIES" FORCE)
     endif ()
 
     macro (copy_dlls target)