diff --git a/CMakeModules/FindFreetype.cmake b/CMakeModules/FindFreetype.cmake deleted file mode 100644 index 774a0ec04..000000000 --- a/CMakeModules/FindFreetype.cmake +++ /dev/null @@ -1,141 +0,0 @@ -# - Locate FreeType library -# This module defines -# FREETYPE_LIBRARY, the library to link against -# FREETYPE_FOUND, if false, do not try to link to FREETYPE -# FREETYPE_INCLUDE_DIRS, where to find headers. -# This is the concatenation of the paths: -# FREETYPE_INCLUDE_DIR_ft2build -# FREETYPE_INCLUDE_DIR_freetype2 -# -# $FREETYPE_DIR is an environment variable that would -# correspond to the ./configure --prefix=$FREETYPE_DIR -# used in building FREETYPE. -# Created by Eric Wing. - -# prefer FindFreetype from cmake distribution -if(EXISTS ${CMAKE_ROOT}/Modules/FindFreetype.cmake) - include(${CMAKE_ROOT}/Modules/FindFreetype.cmake) - - if(FREETYPE_FOUND) - return() - endif() -endif() - -# Ugh, FreeType seems to use some #include trickery which -# makes this harder than it should be. It looks like they -# put ft2build.h in a common/easier-to-find location which -# then contains a #include to a more specific header in a -# more specific location (#include ). -# Then from there, they need to set a bunch of #define's -# so you can do something like: -# #include FT_FREETYPE_H -# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES() -# wants explicit full paths and this trickery doesn't work too well. -# I'm going to attempt to cut out the middleman and hope -# everything still works. - -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - PATHS - $ENV{FREETYPE_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES include -) -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES include -) -FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - PATHS - /usr/local - /usr - /usr/local/X11R6 - /usr/local/X11 - /usr/X11R6 - /usr/X11 - /sw - /opt/local - /opt/csw - /opt - /usr/freeware - PATH_SUFFIXES include include/freetype2 -) - -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - $ENV{FREETYPE_DIR}/include/freetype2 - NO_DEFAULT_PATH -) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES include/freetype2 -) -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - /usr/local/include/freetype2 - /usr/include/freetype2 - /usr/local/X11R6/include/freetype2 - /usr/local/X11/include/freetype2 - /usr/X11R6/include/freetype2 - /usr/X11/include/freetype2 - /sw/include/freetype2 - /opt/local/include/freetype2 - /opt/csw/include/freetype2 - /opt/include/freetype2 - /usr/freeware/include/freetype2 -) - -FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - /usr/local/include/freetype2 - /usr/include/freetype2 - /usr/local/X11R6/include/freetype2 - /usr/local/X11/include/freetype2 - /usr/X11R6/include/freetype2 - /usr/X11/include/freetype2 - /sw/include/freetype2 - /opt/local/include/freetype2 - /opt/csw/include/freetype2 - /opt/include/freetype2 - /usr/freeware/include/freetype2 -) - -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - PATHS - $ENV{FREETYPE_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) -FIND_LIBRARY(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - PATHS - /usr/local - /usr - /usr/local/X11R6 - /usr/local/X11 - /usr/X11R6 - /usr/X11 - /sw - /opt/local - /opt/csw - /opt - /usr/freeware - PATH_SUFFIXES lib64 lib -) - -IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) - SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}") -ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2) - - -SET(FREETYPE_FOUND "NO") -IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - SET(FREETYPE_FOUND "YES") -ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS) - - diff --git a/src/osgPlugins/freetype/CMakeLists.txt b/src/osgPlugins/freetype/CMakeLists.txt index 79d3f7f7e..f29b81cf8 100644 --- a/src/osgPlugins/freetype/CMakeLists.txt +++ b/src/osgPlugins/freetype/CMakeLists.txt @@ -22,6 +22,8 @@ SET(TARGET_H ) SET(TARGET_ADDED_LIBRARIES osgText ) -SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY ) + +SET(TARGET_EXTERNAL_LIBRARIES ${FREETYPE_LIBRARIES} ) + #### end var setup ### SETUP_PLUGIN(freetype)