 +        if (NOT FREETYPE_INCLUDE_DIRS OR NOT FREETYPE_LIBRARIES)
 +          message(FATAL_ERROR "Unable to find freetype.")
 +        endif ()
- endif(OCE_REQUIRES_FREETYPE)
+ endif(OCE_VISU_DEP)
  
  if(OCE_VISUALISATION)

 	else (NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
 		find_library(FREETYPE_LIBRARY freetype)
 	endif(NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
@@ -384,6 +387,22 @@ if(OCE_REQUIRES_FREETYPE)
 	if(CMAKE_CONFIGURATION_TYPES OR NMAKE)
 		find_library(FREETYPE_LIBRARY_DEBUG freetyped "Location of freetype debug library")
 	endif(CMAKE_CONFIGURATION_TYPES OR NMAKE)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6bdbde..adfce63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,7 +384,10 @@ endif(OCE_VISU_DEP)
 if(OCE_VISU_DEP)
 	## TKService requires FreeType
 	if(NOT OCE_USE_BUNDLE AND NOT OCE_USE_BUNDLE_SOURCE)
-		find_package(Freetype REQUIRED)
