From fcd313bf409fb695dc403331370896f0b8e62a30 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 2 Aug 2019 00:28:49 +0200 Subject: [PATCH] cmake: BUNDLE_LIBRARIES disables FHS_INSTALL --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- 2.39.2