diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 9c60d80a7..2c5482be7 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -158,10 +158,8 @@ # Additionally these variables are defined for internal usage: # # MAGNUM_INCLUDE_DIR - Root include dir (w/o dependencies) -# MAGNUM_LIBRARY - Magnum library (w/o dependencies) # MAGNUM_LIBRARY_DEBUG - Debug version of Magnum library, if found # MAGNUM_LIBRARY_RELEASE - Release version of Magnum library, if found -# MAGNUM_*_LIBRARY - Component libraries (w/o dependencies) # MAGNUM_*_LIBRARY_DEBUG - Debug version of given library, if found # MAGNUM_*_LIBRARY_RELEASE - Release version of given library, if found # MAGNUM_PLATFORM_JS - Path to MagnumPlatform.js file @@ -357,14 +355,14 @@ if(NOT TARGET Magnum::Magnum) mark_as_advanced(MAGNUM_LIBRARY_DEBUG MAGNUM_LIBRARY_RELEASE) - # Set the MAGNUM_LIBRARY variable based on what was found, use that - # information to guess also build type of dynamic plugins + # Set the _MAGNUM_LIBRARY variable based on what was found to use it in a + # FPHSA call below if(MAGNUM_LIBRARY_DEBUG AND MAGNUM_LIBRARY_RELEASE) - set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_RELEASE}) + set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_RELEASE) elseif(MAGNUM_LIBRARY_DEBUG) - set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_DEBUG}) + set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_DEBUG) elseif(MAGNUM_LIBRARY_RELEASE) - set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_RELEASE}) + set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_RELEASE) endif() if(MAGNUM_LIBRARY_RELEASE) @@ -1210,7 +1208,7 @@ endif() # Complete the check with also all components include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Magnum - REQUIRED_VARS MAGNUM_INCLUDE_DIR MAGNUM_LIBRARY ${MAGNUM_EXTRAS_NEEDED} + REQUIRED_VARS MAGNUM_INCLUDE_DIR ${_MAGNUM_LIBRARY} ${MAGNUM_EXTRAS_NEEDED} HANDLE_COMPONENTS ${_MAGNUM_REASON_FAILURE_MESSAGE})