FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #802 from eligovision/OpenSceneGraph-3.6_osgtext_fc

Browse Source 
OSG_TEXT_USE_FONTCONFIG cmake option added: Set to ON to enable attem…
This commit is contained in:
OpenSceneGraph git repository 2019-07-26 12:54:16 +01:00 committed by GitHub
commit 312f640a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -501,6 +501,12 @@ ENDIF()
OPTION(OSG_GL_LIBRARY_STATIC "Set to ON to statically link with OpenGL/GLES library." OFF) OPTION(OSG_GL_LIBRARY_STATIC "Set to ON to statically link with OpenGL/GLES library." OFF)
IF (OSG_BUILD_PLATFORM_IPHONE OR ANDROID)
OPTION(OSG_TEXT_USE_FONTCONFIG "Set to ON to enable attempt to use FontConfig in osgText." OFF)
ELSE ()
OPTION(OSG_TEXT_USE_FONTCONFIG "Set to OFF to disable attempt to use FontConfig in osgText." ON)
ENDIF ()
# Map the OSG_GL*_AVAILABLE settings to OSG_GL_* settings # Map the OSG_GL*_AVAILABLE settings to OSG_GL_* settings
IF (OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE OR OSG_GL3_AVAILABLE) IF (OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE OR OSG_GL3_AVAILABLE)
OPTION(OSG_GL_DISPLAYLISTS_AVAILABLE "Set to OFF to disable use of OpenGL display lists." OFF) OPTION(OSG_GL_DISPLAYLISTS_AVAILABLE "Set to OFF to disable use of OpenGL display lists." OFF)

7
src/osgText/CMakeLists.txt
View File

@ -1,4 +1,4 @@
IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT ANDROID) IF(OSG_TEXT_USE_FONTCONFIG)
find_package(Fontconfig MODULE) find_package(Fontconfig MODULE)
ENDIF() ENDIF()
@ -50,9 +50,12 @@ SET(TARGET_LIBRARIES
OpenThreads OpenThreads
) )
if(Fontconfig_FOUND) if(OSG_TEXT_USE_FONTCONFIG AND Fontconfig_FOUND)
MESSAGE(STATUS "osgText will be linked with FontConfig library")
list(APPEND TARGET_LIBRARIES Fontconfig::Fontconfig) list(APPEND TARGET_LIBRARIES Fontconfig::Fontconfig)
ADD_DEFINITIONS(-DWITH_FONTCONFIG) ADD_DEFINITIONS(-DWITH_FONTCONFIG)
else()
MESSAGE(STATUS "osgText will not be linked with FontConfig library")
endif() endif()
SETUP_LIBRARY(${LIB_NAME}) SETUP_LIBRARY(${LIB_NAME})