Fixed: #1000 ft2build.h not found by FindFreetype

15 years ago · 1e1e0c45ae
parent c613b8a103
commit 1e1e0c45ae
2 changed files with 34 additions and 0 deletions
--- a/code/nel/CMakeModules/FindFreeType.cmake
+++ b/code/nel/CMakeModules/FindFreeType.cmake
@ -23,6 +23,23 @@ FIND_PATH(FREETYPE_INCLUDE_DIRS
  PATH_SUFFIXES freetype freetype2
 )

+# ft2build.h does not reside in the freetype include dir
+FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR
+  ft2build.h
+  PATHS
+  /usr/local/include
+  /usr/include
+  /sw/include
+  /opt/local/include
+  /opt/csw/include
+  /opt/include
+)
+
+# combine both include directories into one variable
+IF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
+  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_ADDITIONAL_INCLUDE_DIR})
+ENDIF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
+
 FIND_LIBRARY(FREETYPE_LIBRARY
  NAMES freetype libfreetype freetype219
  PATHS
--- a/code/ryzom/CMakeModules/FindFreeType.cmake
+++ b/code/ryzom/CMakeModules/FindFreeType.cmake
@ -23,6 +23,23 @@ FIND_PATH(FREETYPE_INCLUDE_DIRS
  PATH_SUFFIXES freetype freetype2
 )

+# ft2build.h does not reside in the freetype include dir
+FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR
+  ft2build.h
+  PATHS
+  /usr/local/include
+  /usr/include
+  /sw/include
+  /opt/local/include
+  /opt/csw/include
+  /opt/include
+)
+
+# combine both include directories into one variable
+IF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
+  SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_ADDITIONAL_INCLUDE_DIR})
+ENDIF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
+
 FIND_LIBRARY(FREETYPE_LIBRARY
  NAMES freetype libfreetype freetype219
  PATHS