Fix the use of external libFreeType for CMake. It was failing building on OSX 10.9.

graf2d/asimage/BuildAfterImage.cmake

@@ -79,8 +79,13 @@ else()
   else()
     set(TIFFINCLUDE "--with-tiff=no")
   endif()
-  set(TTFINCLUDE "--with-ttf-includes=-I${FREETYPE_INCLUDE_DIR}")
-
+  foreach(_incdir ${FREETYPE_INCLUDE_DIRS})
+    if(NOT DEFINED TTFINCLUDE) 
+      set(TTFINCLUDE "--with-ttf-includes=-I${_incdir}")
+    else()
+      set(TTFINCLUDE "${TTFINCLUDE}\ -I${_incdir}")
+    endif()
+  endforeach()
   #---copy files from source directory to build directory------------------------------
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libAfterImage
                      COMMAND cmake -E copy_directory  ${CMAKE_CURRENT_SOURCE_DIR}/src/libAfterImage libAfterImage)

graf3d/gl/CMakeLists.txt

@@ -6,7 +6,7 @@ if(builtin_glew)
   ROOT_USE_PACKAGE(graf3d/glew)
 endif()
 
-include_directories(${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR})
+include_directories(${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
 
 ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
 list(REMOVE_ITEM headers  gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h TGLContextPrivate.h 
@@ -26,8 +26,8 @@ else()
   set(gllibs ${OPENGL_LIBRARIES})
 endif()
 
-set_source_files_properties(src/TGLFontManager.cxx PROPERTIES COMPILE_FLAGS "-I${FREETYPE_INCLUDE_DIR} ${FTGL_CFLAGS}")
-set_source_files_properties(src/TGLText.cxx PROPERTIES COMPILE_FLAGS "-I${FREETYPE_INCLUDE_DIR} ${FTGL_CFLAGS}")
+set_source_files_properties(src/TGLFontManager.cxx PROPERTIES COMPILE_FLAGS "${FTGL_CFLAGS}")
+set_source_files_properties(src/TGLText.cxx PROPERTIES COMPILE_FLAGS "${FTGL_CFLAGS}")
 
 ROOT_GENERATE_DICTIONARY(G__GL ${headers} LINKDEF LinkDef.h)
 ROOT_GENERATE_ROOTMAP(RGL LINKDEF LinkDef.h DEPENDENCIES Graf3d Gui Graf Hist Ged MathCore Tree TreePlayer)