From d3cd7f514f8aa62154f915d219d2c1e6a36a7f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 21 Oct 2019 17:49:13 +0200 Subject: [PATCH] CMake: don't override output location if any of these is set. Otherwise it breaks projects that set only one. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1050edc6d..75a1a0c9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,7 +433,7 @@ set(MAGNUM_LIBRARY_SOVERSION 2) # /lib/magnum/importers/ instead of lib/magnum/importers/. Also # adding this to cache, making superprojects pick that up implicitly as well, # without forcing them to explicitly mirror this setting. -if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) +if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY AND NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY AND NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$/bin CACHE PATH "" FORCE) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$/lib CACHE PATH "" FORCE) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$/lib CACHE PATH "" FORCE)