Commit 0a4ece42 authored by Jan Möbius's avatar Jan Möbius

Don't use ftgl anymore and don't warn


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18729 383ad7c9-94d9-4d36-a494-682f7c89f535
parent dbd359c6
......@@ -85,19 +85,19 @@ else()
endif()
find_package( Freetype)
if (NOT FREETYPE_FOUND)
message (MESSAGE "FREETYPE not found! Disabled ftgl support!")
else (NOT FREETYPE_FOUND)
find_package (FTGL)
if (NOT FTGL_FOUND)
message (MESSAGE "FTGL not found! Disabled ftgl support!")
else ()
set(INCLUDE_DIRS ${INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIR_freetype2} ${FREETYPE_INCLUDE_DIR_ft2build} )
set( ADDITIONAL_LINK_LIBRARIES ${ADDITIONAL_LINK_LIBRARIES} ${FTGL_LIBS} ${FREETYPE_LIBRARIES} )
endif ()
endif ()
#find_package( Freetype)
#if (NOT FREETYPE_FOUND)
# message (MESSAGE "FREETYPE not found! Disabled ftgl support!")
#else (NOT FREETYPE_FOUND)
# find_package (FTGL)
# if (NOT FTGL_FOUND)
# message (MESSAGE "FTGL not found! Disabled ftgl support!")
# else ()
# set(INCLUDE_DIRS ${INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIR_freetype2} ${FREETYPE_INCLUDE_DIR_ft2build} )
# set( ADDITIONAL_LINK_LIBRARIES ${ADDITIONAL_LINK_LIBRARIES} ${FTGL_LIBS} ${FREETYPE_LIBRARIES} )
# endif ()
#
#endif ()
include_directories (
..
......
......@@ -62,7 +62,7 @@ else ()
endif ()
acg_openmp ()
acg_ftgl ()
#acg_ftgl ()
# check for OpenGL, GLEW and GLUT as our required dependencies
find_package (OpenGL)
......
......@@ -183,7 +183,6 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
${OPENGL_LIBRARIES}
${GLEW_LIBRARY}
${GLUT_LIBRARIES}
${FTGL_LIBS}
${COREAPP_ADDITIONAL_LINK_LIBRARIES}
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment