From 63ca8b73fc326f0c2d6e473a66a8e95740ea1bcd Mon Sep 17 00:00:00 2001 From: Roman Proskuryakov Date: Sun, 29 May 2016 03:33:06 +0300 Subject: [PATCH] fix: use Freetype in FindMYGUI instead of FREETYPE --- cmake/FindMyGUI.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake index 85a1055f6b..0b3ac730ef 100644 --- a/cmake/FindMyGUI.cmake +++ b/cmake/FindMyGUI.cmake @@ -54,7 +54,7 @@ IF (WIN32) #Windows if ( MYGUI_STATIC ) set(LIB_SUFFIX "Static") - find_package(freetype) + find_package(Freetype) endif ( MYGUI_STATIC ) find_library ( MYGUI_LIBRARIES_REL NAMES MyGUIEngine${LIB_SUFFIX}.lib HINTS ${MYGUI_LIB_DIR} PATH_SUFFIXES "" release relwithdebinfo minsizerel ) @@ -116,19 +116,19 @@ IF (NOT WIN32) # This does not work on Windows for paths with spaces in them SEPARATE_ARGUMENTS(MYGUI_LIBRARIES) ENDIF (NOT WIN32) -SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} ${FREETYPE_LIBRARIES}) +SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} ${Freetype_LIBRARIES}) SET(MYGUI_INCLUDE_DIRS ${MYGUI_INCLUDE_DIRS} CACHE PATH "") SET(MYGUI_LIBRARIES ${MYGUI_LIBRARIES} CACHE STRING "") SET(MYGUI_LIB_DIR ${MYGUI_LIB_DIR} CACHE PATH "") IF (NOT APPLE OR NOT MYGUI_STATIC) # we need explicit freetype libs only on OS X for static build, for other cases just make it TRUE - SET(FREETYPE_LIBRARIES TRUE) + SET(Freetype_LIBRARIES TRUE) ENDIF (NOT APPLE OR NOT MYGUI_STATIC) -IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES) +IF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND Freetype_LIBRARIES) SET(MYGUI_FOUND TRUE) -ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND FREETYPE_LIBRARIES) +ENDIF (MYGUI_INCLUDE_DIRS AND MYGUI_LIBRARIES AND Freetype_LIBRARIES) IF (MYGUI_FOUND) MARK_AS_ADVANCED(MYGUI_LIB_DIR) @@ -152,7 +152,7 @@ ENDIF (MYGUI_FOUND) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MyGUI DEFAULT_MSG MYGUI_INCLUDE_DIRS - FREETYPE_LIBRARIES + Freetype_LIBRARIES MYGUI_LIBRARIES) CMAKE_POLICY(POP)