From 426afa3e700dd562125cb479ca120eedfb6560b2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 8 Mar 2007 21:19:27 +0000 Subject: [PATCH] From Luigi Calori, fixed build of freetype and zlib. --- src/osgPlugins/CMakeLists.txt | 4 ++-- src/osgPlugins/freetype/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index 57cdb8423..fede6bde0 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -88,10 +88,10 @@ IF (BUILD_OSG_OTHER_PLUGINS) ADD_OSG_PLUGIN(ESRIShape) IF(FREETYPE_FOUND) - #SUBDIRS( freetype ) + SUBDIRS( freetype ) ENDIF(FREETYPE_FOUND) IF(ZLIB_FOUND) - #SUBDIRS( zlib ) + ADD_OSG_PLUGIN(zip ) ENDIF(ZLIB_FOUND) ENDIF (BUILD_OSG_OTHER_PLUGINS) diff --git a/src/osgPlugins/freetype/CMakeLists.txt b/src/osgPlugins/freetype/CMakeLists.txt index 7709ceaf4..195b9c99f 100644 --- a/src/osgPlugins/freetype/CMakeLists.txt +++ b/src/osgPlugins/freetype/CMakeLists.txt @@ -1,8 +1,8 @@ IF(WIN32) SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT") ENDIF(WIN32) -INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} ) -LINK_DIRECTORIES( ${FREETYPE_DIR}/lib ) +INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} ) +#LINK_DIRECTORIES( ${FREETYPE_DIR}/lib ) ADD_OSG_PLUGIN(freetype osgText ${FREETYPE_LIBRARY})