Updated freetype2 from 2.9.1 to 2.10.4

CMakeLists.txt

@@ -100,8 +100,8 @@ IF (EMGU_CV_WITH_FREETYPE)
 	  SET(HARFBUZZ_FOUND ON)
 	ENDIF()
 
-  ELSEIF(WIN32 OR APPLE)
-	MESSAGE(STATUS "Setting up freetype for Windows / Mac")
+  ELSEIF(APPLE)
+	MESSAGE(STATUS "Setting up freetype for Mac")
 	    SET(FREETYPE_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/freetype2/include")
 		SET(FREETYPE_LIBRARIES "freetype" CACHE INTERNAL "")
 		SET(FREETYPE_LINK_LIBRARIES_XXXXX ON)
@@ -119,7 +119,10 @@ IF (EMGU_CV_WITH_FREETYPE)
 		SET(HARFBUZZ_LIBRARY "harfbuzz")
 		ADD_SUBDIRECTORY(harfbuzz)
 		SET(HARFBUZZ_FOUND ON)
-		
+  ELSEIF(WIN32)
+	MESSAGE(STATUS "Setting up freetype for Windows")
+	find_package(Freetype) 
+	find_package(harfbuzz) 
   ELSE()
   ENDIF()
 ELSE()

freetype2

@@ -1 +1 @@
-Subproject commit 86bc8a95056c97a810986434a3f268cbe67f2902
+Subproject commit 6a2b3e4007e794bfc6c91030d0ed987f925164a8

platforms/windows/Build_Binary_x86.bat

@@ -183,7 +183,6 @@ SET CMAKE_CONF_FLAGS= -G %CMAKE_CONF% ^
 -DBUILD_WITH_DEBUG_INFO:BOOL=FALSE ^
 -DBUILD_WITH_STATIC_CRT:BOOL=FALSE ^
 -DWITH_OPENGL:BOOL=OFF ^
--DHB_HAVE_FREETYPE:BOOL=TRUE ^
 -DCMAKE_DISABLE_FIND_PACKAGE_BZip2:BOOL=TRUE ^
 -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB:BOOL=TRUE ^
 -DCMAKE_DISABLE_FIND_PACKAGE_PNG:BOOL=TRUE ^
@@ -267,18 +266,43 @@ SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DEMGU_CV_DOCUMENTATION_BUILD:BOOL=TRUE
 REM IF "%5%"=="htmldoc" ^
 REM SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DEMGU_CV_DOCUMENTATION_BUILD:BOOL=TRUE 
 
-
 cd ..
+
+
+SET INSTALL_FOLDER=%cd%\install
+SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DCMAKE_INSTALL_PREFIX:STRING="%INSTALL_FOLDER:\=/%"
+
 cd eigen
 IF NOT EXIST %BUILD_FOLDER% mkdir %BUILD_FOLDER%
 cd %BUILD_FOLDER%
-%CMAKE% -G %CMAKE_CONF% -DCMAKE_BUILD_TYPE:STRING="Release" ..
+%CMAKE% -G %CMAKE_CONF% -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_INSTALL_PREFIX:STRING="%INSTALL_FOLDER:\=/%" ..
+%CMAKE% --build . --config Release --parallel --target install
 cd ..
 cd ..
 SET EIGEN_DIR=%cd%\eigen\%BUILD_FOLDER%
+REM SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DEigen3_DIR:STRING=%EIGEN_DIR%
+
+cd freetype2
+IF NOT EXIST %BUILD_FOLDER% mkdir %BUILD_FOLDER%
 cd %BUILD_FOLDER%
+%CMAKE% -G %CMAKE_CONF% -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_INSTALL_PREFIX:STRING="%INSTALL_FOLDER:\=/%" ..
+%CMAKE% --build . --config Release --parallel --target install
+cd ..
+cd ..
+SET FREETYPE_DIR=%cd%\freetype2\%BUILD_FOLDER%
+REM SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DFreetype_DIR:STRING=%FREETYPE_DIR% 
 
-SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DEigen3_DIR:STRING=%EIGEN_DIR% 
+cd harfbuzz
+IF NOT EXIST %BUILD_FOLDER% mkdir %BUILD_FOLDER%
+cd %BUILD_FOLDER%
+%CMAKE% -G %CMAKE_CONF% -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_INSTALL_PREFIX:STRING="%INSTALL_FOLDER:\=/%" -DCMAKE_FIND_ROOT_PATH:STRING=%INSTALL_FOLDER:\=/% -DHB_HAVE_FREETYPE:BOOL=TRUE ..
+%CMAKE% --build . --config Release --parallel --target install
+cd ..
+cd ..
+SET HARFBUZZ_DIR=%cd%\harfbuzz\%BUILD_FOLDER%
+REM SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DHarfbuzz_DIR:STRING=%HARFBUZZ_DIR%
+ 
+cd %BUILD_FOLDER%
 
 REM echo %NETFX_CORE%
 IF %NETFX_CORE%=="TRUE" GOTO NETFX_CORE