ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5013 Commits
21 Branches
19 Tags
70 MiB
Tree: ae4c8f55b6
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ae4c8f55b6'
${ noResults }
magnum/src/Magnum/Text/CMakeLists.txt

90 lines
3.5 KiB
Raw Normal View History Unescape

Relicensing to MIT/Expat license, part 4: CMake and documentation files. They didn't contain license header before, but I think adding it also there wouldn't do any harm. Documentation is also integral part of the codebase.
13 years ago
#
# This file is part of Magnum.
#
Hell, this project is big.
10 years ago
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
Happy new year too.
12 years ago
# Vladimír Vondruš <mosra@centrum.cz>
Relicensing to MIT/Expat license, part 4: CMake and documentation files. They didn't contain license header before, but I think adding it also there wouldn't do any harm. Documentation is also integral part of the codebase.
13 years ago
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
set(MagnumText_SRCS
Text: abstract base for fonts and layouters. Font and text layouting is now abstracted out from its implementation. Font class is renamed to FreeTypeFont and all the work can be done through AbstractFont and AbstractLayouter interface.
13 years ago
AbstractFont.cpp
Text: interface for font converters. Provides a way to convert font into different format (either with or without contents of associated glyph cache) or import/export glyph cache (i.e. to avoid recreating it from scratch every time).
13 years ago
AbstractFontConverter.cpp
Text: moved glyph caching into separate classes. The API is similar for both basic and distance field caching.
13 years ago
DistanceFieldGlyphCache.cpp
GlyphCache.cpp
Text: renamed Text::TextRenderer to Text::Renderer. No redundant naming. Text::Renderer2D and Text::Renderer3D is typedef'd to old name, the typedefs are deprecated and will be removed in some future release.
13 years ago
Renderer.cpp)
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
set(MagnumText_HEADERS
Text: abstract base for fonts and layouters. Font and text layouting is now abstracted out from its implementation. Font class is renamed to FreeTypeFont and all the work can be done through AbstractFont and AbstractLayouter interface.
13 years ago
AbstractFont.h
Text: interface for font converters. Provides a way to convert font into different format (either with or without contents of associated glyph cache) or import/export glyph cache (i.e. to avoid recreating it from scratch every time).
13 years ago
AbstractFontConverter.h
Text: support for aligning rendered text.
13 years ago
Alignment.h
Text: moved glyph caching into separate classes. The API is similar for both basic and distance field caching.
13 years ago
DistanceFieldGlyphCache.h
GlyphCache.h
Text: renamed Text::TextRenderer to Text::Renderer. No redundant naming. Text::Renderer2D and Text::Renderer3D is typedef'd to old name, the typedefs are deprecated and will be removed in some future release.
13 years ago
Renderer.h
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
Text.h
Making includes absolute, part 6: better filenames for internal files. As we are now using absolute includes, there is no need to prefix everything with "magnum<Namespace>" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions.
13 years ago
visibility.h)
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
Use POSITION_INDEPENDENT_CODE CMake property. New in 2.8.9, much cleaner than the previous "solution". Also cleaned up the surroundings a bit. Fixed cases where PIC was forced independently of the settings, for plugins the PIC is now also set only when needed/requested.
12 years ago
# Text library
Display all headers in project view of IDEs. Finally makes development with QtCreator usable.
12 years ago
add_library(MagnumText ${SHARED_OR_STATIC}
${MagnumText_SRCS}
${MagnumText_HEADERS})
Install and find debug libraries with "-d" suffix. Makes it possible to have both debug and release libraries installed. If both libraries are present when finding the package, proper version is used based on what configuration is used in depending project.
12 years ago
set_target_properties(MagnumText PROPERTIES DEBUG_POSTFIX "-d")
Option to build Magnum as static library. And optionaly position-independent code. The tests now pass again, if both Corrade and Magnum is static.
13 years ago
if(BUILD_STATIC_PIC)
Use POSITION_INDEPENDENT_CODE CMake property. New in 2.8.9, much cleaner than the previous "solution". Also cleaned up the surroundings a bit. Fixed cases where PIC was forced independently of the settings, for plugins the PIC is now also set only when needed/requested.
12 years ago
set_target_properties(MagnumText PROPERTIES POSITION_INDEPENDENT_CODE ON)
Option to build Magnum as static library. And optionaly position-independent code. The tests now pass again, if both Corrade and Magnum is static.
13 years ago
endif()
Text: moved FreeType and HarfBuzz fonts into plugins. In next few commits AbstractFont will become plugin interface. Font implementations are now in magnum-plugins repository. Removed all traces of FreeType and HarfBuzz dependencies.
13 years ago
target_link_libraries(MagnumText Magnum MagnumTextureTools)
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
Fix installation dir for DLLs on Windows. Similar change to mosra/corrade@8fbedb0df2557e8b18acbb358b83bd93d7da7e20.
13 years ago
install(TARGETS MagnumText
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
Text: initial implementation of font and text rendering. The library uses FreeType for glyph pre-rendering and basic glyph geometry and HarfBuzz for text layouting (i.e. ligatures, kerning, ...). Currently all used glyphs must be prerendered into texture atlas, other glyphs are simply not rendered (although the layouting code handles them like if they are there). Text rendering supports UTF-8, although glyph pre-rendering is currently ASCII only, as I couldn't find any working implementation of Unicode STL function in recent GCC versions. Will be fixed later.
14 years ago
install(FILES ${MagnumText_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Text)
Text: reworked AbstractFont plugin interface. Implementation is moved into `do*()` private virtual functions, public interface is doing additional sanity checks around them. Opening files is by default done in base implementation, which loads the files into memory and then calls function for opening raw data. Added interface for opening multi-file fonts from raw data, default implementation just calls single-file implementation. Function for creating glyph cache converts the text from UTF-8 to UTF-32 and then calls the implementation, removing the burden from reimplementing this in each plugin. Added unit test for file and single data opening, bumped plugin version to 0.2.
13 years ago
Text: added magnum-fontconverter utility. Again borrowed from Push the Box, modified and made slightly more configurable. Will write proper docs for the utilities when I have some more time.
13 years ago
if(WITH_FONTCONVERTER)
Text: renamed configure.h.cmake to fontconverterConfigure.h.cmake. Reason is that the configure file is not for whole Text library, but only for the magnum-fontconverter utility. Rename it so it is more clear.
12 years ago
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fontconverterConfigure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/fontconverterConfigure.h)
Text: added magnum-fontconverter utility. Again borrowed from Push the Box, modified and made slightly more configurable. Will write proper docs for the utilities when I have some more time.
13 years ago
add_executable(magnum-fontconverter fontconverter.cpp)
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
target_include_directories(magnum-fontconverter PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(magnum-fontconverter Magnum MagnumText)
Added TARGET_HEADLESS option. Toggles between using CGL/GLX/WGL (requiring running graphical desktop environment) or EGL (without display attachment) for command-line utilities and GL tests. Also exposed to the user through MAGNUM_TARGET_HEADLESS CMake and preprocessor variables.
10 years ago
if(MAGNUM_TARGET_HEADLESS)
target_link_libraries(magnum-fontconverter MagnumWindowlessEglApplication)
elseif(CORRADE_TARGET_APPLE)
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
target_link_libraries(magnum-fontconverter MagnumWindowlessCglApplication)
Be consistent and use our own platform definitions.
12 years ago
elseif(CORRADE_TARGET_UNIX AND NOT TARGET_GLES)
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
target_link_libraries(magnum-fontconverter MagnumWindowlessGlxApplication)
Disable other utilities on Windows/GLES. They require texture image queries which aren't available there.
11 years ago
elseif(CORRADE_TARGET_WINDOWS AND NOT TARGET_GLES)
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
target_link_libraries(magnum-fontconverter MagnumWindowlessWglApplication)
Enabled other utilities on Windows.
12 years ago
else()
message(FATAL_ERROR "magnum-fontconverter is not available on this platform. Set WITH_FONTCONVERTER to OFF to suppress this warning.")
endif()
Text: added magnum-fontconverter utility. Again borrowed from Push the Box, modified and made slightly more configurable. Will write proper docs for the utilities when I have some more time.
13 years ago
install(TARGETS magnum-fontconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
# Magnum fontconverter target alias for superprojects
add_executable(Magnum::fontconverter ALIAS magnum-fontconverter)
Text: added magnum-fontconverter utility. Again borrowed from Push the Box, modified and made slightly more configurable. Will write proper docs for the utilities when I have some more time.
13 years ago
endif()
Text: reworked AbstractFont plugin interface. Implementation is moved into `do*()` private virtual functions, public interface is doing additional sanity checks around them. Opening files is by default done in base implementation, which loads the files into memory and then calls function for opening raw data. Added interface for opening multi-file fonts from raw data, default implementation just calls single-file implementation. Function for creating glyph cache converts the text from UTF-8 to UTF-32 and then calls the implementation, removing the burden from reimplementing this in each plugin. Added unit test for file and single data opening, bumped plugin version to 0.2.
13 years ago
if(BUILD_TESTS)
add_subdirectory(Test)
endif()
CMake subproject support, part 2: export MAGNUM_* variables. This way the FindMagnum.cmake module will have everything found already and so it will do only some additional management on top.
11 years ago
Modern CMake usage: reworked to use target-specific properties. As with Corrade, this is not exactly backwards compatible, but for common use case without OBJECT libraries this should not be a problem. In any case, recreate the build dir and update your copy of all Find*.cmake modules to avoid weird things happening. User-facing changes: * Documentation of all Find*.cmake modules converted to reStructuredText to follow official CMake guidelines. * The newfangled way to use the libraries is to link to Magnum::Shaders instead of adding ${MAGNUM_SHADERS_INCLUDE_DIRS} to include path and linking to ${MAGNUM_SHADERS_LIBRARIES}. * The old ${MAGNUM_*_LIBRARIES} are deprecated and now just expand to Magnum::* target. Use the target directly. These are also enabled only when building with MAGNUM_BUILD_DEPRECATED. * The old ${MAGNUM_*_INCLUDE_DIRS} are removed as the Magnum::* targets cover these too. Internal changes: * Global state such as include_directories() was replaced with target-specific settings.
10 years ago
# Magnum Text target alias for superprojects
add_library(Magnum::Text ALIAS MagnumText)