5e3d198d9f
fix build on 13.1+: * freetype includes are now in include/freetype2 * OGRE needs libboost_system on linker commandline OBS-URL: https://build.opensuse.org/request/show/227258 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=11
16 lines
800 B
Diff
16 lines
800 B
Diff
Index: b/CMake/Packages/FindFreetype.cmake
|
|
===================================================================
|
|
--- a/CMake/Packages/FindFreetype.cmake
|
|
+++ b/CMake/Packages/FindFreetype.cmake
|
|
@@ -39,6 +39,10 @@ find_library(FREETYPE_LIBRARY_REL NAMES
|
|
find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
|
|
make_library_set(FREETYPE_LIBRARY)
|
|
|
|
+# openSUSE +13.1 has both in one directory and there is no freetype/freetype.h inside include/freetype2
|
|
+if (NOT FREETYPE_INCLUDE_DIR)
|
|
+ set(FREETYPE_INCLUDE_DIR ${FREETYPE_FT2BUILD_INCLUDE_DIR})
|
|
+endif ()
|
|
findpkg_finish(FREETYPE)
|
|
mark_as_advanced(FREETYPE_FT2BUILD_INCLUDE_DIR)
|
|
if (NOT FREETYPE_FT2BUILD_INCLUDE_DIR STREQUAL FREETYPE_INCLUDE_DIR)
|