From b4df8db9a9125f5d852fa26b4b3b6d12b0d3078d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 26 Mar 2018 19:48:48 +0200 Subject: [PATCH] CMake: proper absolute MAGNUM_PLUGINS_DIR variables. Broken since 05ed476446b9ed41d62af3ffee4b5756d7e6032f (June 2017). Oh well. --- CMakeLists.txt | 12 ++++++------ doc/changelog.dox | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cb1ba73e..2e47fba2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -306,16 +306,16 @@ set(MAGNUM_PLUGINS_AUDIOIMPORTER_RELEASE_LIBRARY_INSTALL_DIR ${MAGNUM_PLUGINS_RE # Plugin dirs based on wheter we are in debug or release build, needed by some # command-line tools if(CORRADE_TARGET_WINDOWS) - set(MAGNUM_PLUGINS_DEBUG_DIR_INIT ${MAGNUM_PLUGINS_DEBUG_BINARY_INSTALL_DIR}) - set(MAGNUM_PLUGINS_RELEASE_DIR_INIT ${MAGNUM_PLUGINS_RELEASE_BINARY_INSTALL_DIR}) + set(MAGNUM_PLUGINS_DEBUG_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_DEBUG_BINARY_INSTALL_DIR}) + set(MAGNUM_PLUGINS_RELEASE_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_RELEASE_BINARY_INSTALL_DIR}) else() - set(MAGNUM_PLUGINS_DEBUG_DIR_INIT ${MAGNUM_PLUGINS_DEBUG_LIBRARY_INSTALL_DIR}) - set(MAGNUM_PLUGINS_RELEASE_DIR_INIT ${MAGNUM_PLUGINS_RELEASE_LIBRARY_INSTALL_DIR}) + set(MAGNUM_PLUGINS_DEBUG_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_DEBUG_LIBRARY_INSTALL_DIR}) + set(MAGNUM_PLUGINS_RELEASE_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_RELEASE_LIBRARY_INSTALL_DIR}) endif() if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(MAGNUM_PLUGINS_DIR_INIT ${MAGNUM_PLUGINS_DEBUG_DIR_INIT}) + set(MAGNUM_PLUGINS_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_DEBUG_DIR_INIT}) else() - set(MAGNUM_PLUGINS_DIR_INIT ${MAGNUM_PLUGINS_RELEASE_DIR_INIT}) + set(MAGNUM_PLUGINS_DIR_INIT ${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_RELEASE_DIR_INIT}) endif() # Make these paths configurable from outside. This is *not* PATH, because CMake diff --git a/doc/changelog.dox b/doc/changelog.dox index a15a7c498..1e0a114db 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -101,6 +101,8 @@ See also: - @ref Attribute::DataType::HalfFloat was not available on WebGL 2 by mistake - A wrong code path for @ref Framebuffer::checkStatus() was selected on WebGL 1 by mistake +- Fixed `MAGNUM_PLUGINS_DIR` variables to contain proper absolute location by + default again. @subsection changelog-latest-deprecated Deprecated APIs