Merge topic 'FindFreetype-debug-lib'
b213a7f6
FindFreetype: Find release and debug libraries separately
This commit is contained in:
commit
5f3bfab7b7
|
@ -87,15 +87,28 @@ find_path(
|
||||||
freetype2
|
freetype2
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(FREETYPE_LIBRARY
|
if(NOT FREETYPE_LIBRARY)
|
||||||
NAMES
|
find_library(FREETYPE_LIBRARY_RELEASE
|
||||||
freetype
|
NAMES
|
||||||
libfreetype
|
freetype
|
||||||
freetype219
|
libfreetype
|
||||||
${FREETYPE_FIND_ARGS}
|
freetype219
|
||||||
PATH_SUFFIXES
|
${FREETYPE_FIND_ARGS}
|
||||||
lib
|
PATH_SUFFIXES
|
||||||
)
|
lib
|
||||||
|
)
|
||||||
|
find_library(FREETYPE_LIBRARY_DEBUG
|
||||||
|
NAMES
|
||||||
|
freetyped
|
||||||
|
libfreetyped
|
||||||
|
freetype219d
|
||||||
|
${FREETYPE_FIND_ARGS}
|
||||||
|
PATH_SUFFIXES
|
||||||
|
lib
|
||||||
|
)
|
||||||
|
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
|
||||||
|
select_library_configurations(FREETYPE)
|
||||||
|
endif()
|
||||||
|
|
||||||
unset(FREETYPE_FIND_ARGS)
|
unset(FREETYPE_FIND_ARGS)
|
||||||
|
|
||||||
|
@ -147,7 +160,6 @@ find_package_handle_standard_args(
|
||||||
)
|
)
|
||||||
|
|
||||||
mark_as_advanced(
|
mark_as_advanced(
|
||||||
FREETYPE_LIBRARY
|
|
||||||
FREETYPE_INCLUDE_DIR_freetype2
|
FREETYPE_INCLUDE_DIR_freetype2
|
||||||
FREETYPE_INCLUDE_DIR_ft2build
|
FREETYPE_INCLUDE_DIR_ft2build
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue