Browse Source

modules: don't set MAGNUM_LIBRARY, it's useless.

And MAGNUM_*_LIBRARY doesn't exist either, these are all leftovers from
old CMake times before imported targets were a thing.
pull/674/head
Vladimír Vondruš 1 year ago
parent
commit
bd80109377
  1. 14
      modules/FindMagnum.cmake

14
modules/FindMagnum.cmake

@ -158,10 +158,8 @@
# Additionally these variables are defined for internal usage: # Additionally these variables are defined for internal usage:
# #
# MAGNUM_INCLUDE_DIR - Root include dir (w/o dependencies) # 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_DEBUG - Debug version of Magnum library, if found
# MAGNUM_LIBRARY_RELEASE - Release 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_DEBUG - Debug version of given library, if found
# MAGNUM_*_LIBRARY_RELEASE - Release version of given library, if found # MAGNUM_*_LIBRARY_RELEASE - Release version of given library, if found
# MAGNUM_PLATFORM_JS - Path to MagnumPlatform.js file # MAGNUM_PLATFORM_JS - Path to MagnumPlatform.js file
@ -357,14 +355,14 @@ if(NOT TARGET Magnum::Magnum)
mark_as_advanced(MAGNUM_LIBRARY_DEBUG mark_as_advanced(MAGNUM_LIBRARY_DEBUG
MAGNUM_LIBRARY_RELEASE) MAGNUM_LIBRARY_RELEASE)
# Set the MAGNUM_LIBRARY variable based on what was found, use that # Set the _MAGNUM_LIBRARY variable based on what was found to use it in a
# information to guess also build type of dynamic plugins # FPHSA call below
if(MAGNUM_LIBRARY_DEBUG AND MAGNUM_LIBRARY_RELEASE) if(MAGNUM_LIBRARY_DEBUG AND MAGNUM_LIBRARY_RELEASE)
set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_RELEASE}) set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_RELEASE)
elseif(MAGNUM_LIBRARY_DEBUG) elseif(MAGNUM_LIBRARY_DEBUG)
set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_DEBUG}) set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_DEBUG)
elseif(MAGNUM_LIBRARY_RELEASE) elseif(MAGNUM_LIBRARY_RELEASE)
set(MAGNUM_LIBRARY ${MAGNUM_LIBRARY_RELEASE}) set(_MAGNUM_LIBRARY MAGNUM_LIBRARY_RELEASE)
endif() endif()
if(MAGNUM_LIBRARY_RELEASE) if(MAGNUM_LIBRARY_RELEASE)
@ -1210,7 +1208,7 @@ endif()
# Complete the check with also all components # Complete the check with also all components
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Magnum 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 HANDLE_COMPONENTS
${_MAGNUM_REASON_FAILURE_MESSAGE}) ${_MAGNUM_REASON_FAILURE_MESSAGE})

Loading…
Cancel
Save