From 2e798ae364fc6d9efc083abd04f41d72418ebc7e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 29 May 2007 10:01:18 +0000 Subject: [PATCH] From Olaf Flebbe, "recently I discovered that the freetype plugin does not work, because CMake doesn't recognize it properly on windows. 1) the header detection on a directory "freetype" fails, it seems to need a filename: "ft2build.h" actually works. 2) the 3rdparty I am supplying for FlightGear contains freetype-2.3.4. I added the correct library naming for this particular release. I double-checked my directory layout with the 3rdparty supplied by other OSG contributors." --- CMakeModules/Find3rdPartyDependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake index cfc3d1074..eb5eb5515 100644 --- a/CMakeModules/Find3rdPartyDependencies.cmake +++ b/CMakeModules/Find3rdPartyDependencies.cmake @@ -52,7 +52,7 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGS MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D") - FIND_DEPENDENCY(FREETYPE freetype "freetype;freetype219" ${OSG_3RDPARTY_BIN} "_D") + FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype219;freetype234MT" ${OSG_3RDPARTY_BIN} "_D") IF(FREETYPE_FOUND) #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "")