Restructure the includes of freetype

src/osgPlugins/freetype/CMakeLists.txt

@@ -2,7 +2,7 @@ IF(WIN32)
     SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
 ENDIF()
 
-INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}/freetype ${FREETYPE_INCLUDE_DIR_freetype2})
 
 IF(APPLE)
   SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")

src/osgPlugins/freetype/FreeTypeFont3D.cpp

@@ -29,8 +29,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include <freetype/ftoutln.h>
-#include <freetype/ftbbox.h>
+#include <ftoutln.h>
+#include <ftbbox.h>
 
 
 

src/osgPlugins/freetype/FreeTypeLibrary.cpp

@@ -17,7 +17,7 @@
 
 //#define PRINT_OUT_FONT_DETAILS
 #ifdef PRINT_OUT_FONT_DETAILS
-    #include <freetype/ftsnames.h>
+    #include <ftsnames.h>
 #endif
 
 #include FT_TRUETYPE_IDS_H