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.
11359 Commits
21 Branches
19 Tags
70 MiB
Tree: 69f2da2423
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '69f2da2423'
${ noResults }
magnum/src/Magnum/Text/CMakeLists.txt

198 lines
7.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.
#
Updated copyright year.
6 years ago
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Here we go again.
1 year ago
# 2020, 2021, 2022, 2023, 2024, 2025
It's October already?!
2 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.
#
CMake: use the CMAKE_FOLDER variable instead of FOLDER property. It limits the support for CMake 3.12+, but it's much less verbose and I don't expect people to use ancient CMake versions with IDEs like Xcode or VS anyway, so this should be fine.
4 years ago
# IDE folder in VS, Xcode etc. CMake 3.12+, older versions have only the FOLDER
# property that would have to be set on each target separately.
set(CMAKE_FOLDER "Magnum/Text")
Split the Trade library out.
8 years ago
find_package(Corrade REQUIRED PluginManager)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
# Files shared between main library and unit test library
Text: rename Direction to ShapeDirection, move to a dedicated header. Because there's going to be LayoutDirection as well, for controlling how line progression happens. Because nothing in text rendering is simple.
3 years ago
set(MagnumText_SRCS
Direction.cpp)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
# Files compiled with different flags for main library and unit test library
set(MagnumText_GracefulAssert_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: explicitly test also converter assertions.
6 years ago
AbstractFontConverter.cpp
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
AbstractGlyphCache.cpp
Text: new AbstractShaper interface for shaping. Replaces the previous, grossly inefficient AbstractLayouter which was performing one virtual call per glyph (!). It's now also reusable, meaning it doesn't need to be allocated anew for every new shaped text, and it no longer requires each and every font plugin to implement the same redundant glyph data fetching from the glyph cache, scaling etc. -- all that is meant to be done by the users of AbstractShaper, i.e. Renderer. The independency on a glyph cache theorerically also means it can be used for a completely different, non-texture-based way to render text (such as direct path drawing directly on the GPU), although I won't be exploring that path now. It also exposes an interface for specifying script, language, direction and typographic features. Such interface will be currently only implemented in HarfBuzz, but that's the intent -- to provide a flexible enough interface to support all possible use cases that a font or a font plugin may support, instead of exposing a least common denominator and then having no easy way to shape a text in a non-Latin script or use a fancy OpenType feature the chosen font has. The old public interface is preserved for backwards compatibility, marked as deprecated, however the virtual APIs are not, as supporting that would be too nasty. I don't think any user code ever implemented a font plugin so this should be okay. To ensure smooth transition with no regressions, the Renderer class and MagnumFont tests still use the old API in this commit, and their test pass the same way as they did before (except for two removed MagnumFont test cases which tested errors that are now an assertion in the deprecated layout() API and thus cannot be tested from the plugin anymore). Porting them away from the deprecated API will be done in separate commits.
3 years ago
AbstractShaper.cpp
Text: introduce Alignment::*Start and *End. Based on the actual text direction (either explicitly set or detected), these resolve to either *Left or *Right. For the Text::Renderer it's done automatically inside (and there's no way to actually set the direction from outside due to the API being ancient and limited), for the align*() utils the alignment has to be explicitly resolved using a new alignmentForDirection() utility.
2 years ago
Alignment.cpp
Text: added a Feature enum. Like the Script enum, to be used for the new AbstractShaper API.
3 years ago
Feature.cpp
Text: new, reusable and composable guts for the Renderer. The awful original STL-heavy public API is kept the same for now, it's just the internals being now implemented using brand new APIs that are actually usable with multiple fonts, font sizes and runs with different scripts/languages/directions. There's also preparation for configurable vertical text layouting, although for now the functionality asserts that horizontal text is used. This also makes Renderer.h header available on non-GL builds, as the new APIs don't rely on a class full of GL objects anymore. The class will get eventually renamed and moved to a dedicated RendererGL.h header, but for now this partial update has to suffice.
3 years ago
Renderer.cpp
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
Script.cpp)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
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: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
AbstractGlyphCache.h
Text: new AbstractShaper interface for shaping. Replaces the previous, grossly inefficient AbstractLayouter which was performing one virtual call per glyph (!). It's now also reusable, meaning it doesn't need to be allocated anew for every new shaped text, and it no longer requires each and every font plugin to implement the same redundant glyph data fetching from the glyph cache, scaling etc. -- all that is meant to be done by the users of AbstractShaper, i.e. Renderer. The independency on a glyph cache theorerically also means it can be used for a completely different, non-texture-based way to render text (such as direct path drawing directly on the GPU), although I won't be exploring that path now. It also exposes an interface for specifying script, language, direction and typographic features. Such interface will be currently only implemented in HarfBuzz, but that's the intent -- to provide a flexible enough interface to support all possible use cases that a font or a font plugin may support, instead of exposing a least common denominator and then having no easy way to shape a text in a non-Latin script or use a fancy OpenType feature the chosen font has. The old public interface is preserved for backwards compatibility, marked as deprecated, however the virtual APIs are not, as supporting that would be too nasty. I don't think any user code ever implemented a font plugin so this should be okay. To ensure smooth transition with no regressions, the Renderer class and MagnumFont tests still use the old API in this commit, and their test pass the same way as they did before (except for two removed MagnumFont test cases which tested errors that are now an assertion in the deprecated layout() API and thus cannot be tested from the plugin anymore). Porting them away from the deprecated API will be done in separate commits.
3 years ago
AbstractShaper.h
Text: support for aligning rendered text.
13 years ago
Alignment.h
Text: rename Direction to ShapeDirection, move to a dedicated header. Because there's going to be LayoutDirection as well, for controlling how line progression happens. Because nothing in text rendering is simple.
3 years ago
Direction.h
Text: added a Feature enum. Like the Script enum, to be used for the new AbstractShaper API.
3 years ago
Feature.h
Text: new, reusable and composable guts for the Renderer. The awful original STL-heavy public API is kept the same for now, it's just the internals being now implemented using brand new APIs that are actually usable with multiple fonts, font sizes and runs with different scripts/languages/directions. There's also preparation for configurable vertical text layouting, although for now the functionality asserts that horizontal text is used. This also makes Renderer.h header available on non-GL builds, as the new APIs don't rely on a class full of GL objects anymore. The class will get eventually renamed and moved to a dedicated RendererGL.h header, but for now this partial update has to suffice.
3 years ago
Renderer.h
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
Script.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.
12 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
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
set(MagnumText_PRIVATE_HEADERS
Text: new RendererCore class. A higher-level stateful wrapper around the low-level utilities, capable of rendering text formed from multiple lines and multiple fonts. Will be used as a backend for a new Renderer / RendererGL implementation. No usage docs yet, those will come once the other two classes are made as well.
2 years ago
Implementation/printFourCC.h
Implementation/rendererState.h)
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_TARGET_GL)
Text: full test coverage for the GlyphCache classes. About time this got done. This also has an XFAIL for the case where a distance field image is processed with an offset, have to fix the underlying issue in TextureTools first. Also added a range assertion for the distance field image setter to match what the abstract base does, together with a corresponding getter.
3 years ago
list(APPEND MagnumText_GracefulAssert_SRCS
Text: only allow creating processed GlyphCacheGL by subclasses. So the users don't accidentally create an instance with the processed format / size being different only to get greeted by a nasty bounds or format assertion inside flushImage() / doSetImage(). Now it's only allowed to be done by a subclass (such as DistanceFieldGlyphCacheGL, or, ahem, MagnumFont), and doSetImage() additionally has an assert to notify the implementer that a subclass needs to provide its own override. This also feels kind of messy, honestly. It's as if the DistanceFieldGlyphCache should never have been a subclass, maybe?
2 years ago
DistanceFieldGlyphCacheGL.cpp
Text: new RendererGL class. This is a replacement for the existing AbstractRenderer and Renderer2D / Renderer3D classes, with no STL or other shittiness like excessive allocations, and with a much better feature set. Deprecation of the old APIs is going to happen next. Compared to the old implementation it doesn't make use of the complicated buffer mapping because -- unlike in 2012 -- such behavior was since deemed questionable as the driver (or whichever translation layer like ANGLE or Zink or Apple's GL-over-Metal) may still make a copy anyway and doing so prevents buffer orphaning. So it's right now just plain setData() / setSubData() calls. *If* it becomes some sort of a bottleneck (which I doubt), I may reconsider, or add something else like double buffering.
1 year ago
GlyphCacheGL.cpp
RendererGL.cpp)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
list(APPEND MagnumText_HEADERS
Text: renamed {DistanceField,}GlyphCache to {DistanceField}GlyphCacheGL. Like with TextureTools::DistanceField, to make room for non-GL implementations. Old names are deprecated aliases, same for headers. The only remaining bit in the Text library is the Renderer class, but for that one I first need to invent a non-shitty API so I can just deprecate the old thing as a whole and create something reasonable from scratch in RendererGL.
2 years ago
DistanceFieldGlyphCacheGL.h
Text: new RendererGL class. This is a replacement for the existing AbstractRenderer and Renderer2D / Renderer3D classes, with no STL or other shittiness like excessive allocations, and with a much better feature set. Deprecation of the old APIs is going to happen next. Compared to the old implementation it doesn't make use of the complicated buffer mapping because -- unlike in 2012 -- such behavior was since deemed questionable as the driver (or whichever translation layer like ANGLE or Zink or Apple's GL-over-Metal) may still make a copy anyway and doing so prevents buffer orphaning. So it's right now just plain setData() / setSubData() calls. *If* it becomes some sort of a bottleneck (which I doubt), I may reconsider, or add something else like double buffering.
1 year ago
GlyphCacheGL.h
RendererGL.h)
Text: renamed {DistanceField,}GlyphCache to {DistanceField}GlyphCacheGL. Like with TextureTools::DistanceField, to make room for non-GL implementations. Old names are deprecated aliases, same for headers. The only remaining bit in the Text library is the Renderer class, but for that one I first need to invent a non-shitty API so I can just deprecate the old thing as a whole and create something reasonable from scratch in RendererGL.
2 years ago
if(MAGNUM_BUILD_DEPRECATED)
list(APPEND MagnumText_HEADERS
DistanceFieldGlyphCache.h
GlyphCache.h)
endif()
Text: explicitly test also converter assertions.
6 years ago
else()
# So MagnumTextObjects has at least something
list(APPEND MagnumText_SRCS ${PROJECT_SOURCE_DIR}/src/dummy.cpp)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
endif()
Don't compile pluginSearchPaths() on platforms that don't need it.
8 years ago
if(NOT CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
endif()
Implement pluginSearchPaths() for all plugin interfaces.
8 years ago
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
# Objects shared between main and test library
add_library(MagnumTextObjects OBJECT
Display all headers in project view of IDEs. Finally makes development with QtCreator usable.
12 years ago
${MagnumText_SRCS}
Text: added a Script enum. Will be used for the upcoming new AbstractShaper API. It's based on the ISO script codes, matching the HarfBuzz script enum, with the intention of being passed to it as-is.
3 years ago
${MagnumText_HEADERS}
${MagnumText_PRIVATE_HEADERS})
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_include_directories(MagnumTextObjects PUBLIC
$<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>)
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_TARGET_GL)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_include_directories(MagnumTextObjects PUBLIC $<TARGET_PROPERTY:MagnumGL,INTERFACE_INCLUDE_DIRECTORIES>)
endif()
CMake: avoid installed Magnum headers being picked over local ones. If Magnum and Corrade get installed into the same directory, target_include_directories() or target_link_libraries() with Corrade before Magnum will result in the (usually stale) installed Magnum headers being picked over the local ones. Which is unwanted, so try to always put the local Magnum include path first. Tested manually by installing to an arbitrary location and editing configure.h to contain an #error. That failed for the Text library, and with these changes it now doesn't fail anymore, but that's not a guarantee that I managed to fix all such cases.
3 years ago
# Include dependencies after Magnum itself, to avoid stale installed Magnum
# headers being preferred over the project-local ones
target_include_directories(MagnumTextObjects PUBLIC
$<TARGET_PROPERTY:Corrade::PluginManager,INTERFACE_INCLUDE_DIRECTORIES>)
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(NOT MAGNUM_BUILD_STATIC)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_compile_definitions(MagnumTextObjects PRIVATE "MagnumTextObjects_EXPORTS")
endif()
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(NOT MAGNUM_BUILD_STATIC OR MAGNUM_BUILD_STATIC_PIC)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
set_target_properties(MagnumTextObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
# Text library
add_library(MagnumText ${SHARED_OR_STATIC}
$<TARGET_OBJECTS:MagnumTextObjects>
${MagnumText_GracefulAssert_SRCS})
CMake: use the CMAKE_FOLDER variable instead of FOLDER property. It limits the support for CMake 3.12+, but it's much less verbose and I don't expect people to use ancient CMake versions with IDEs like Xcode or VS anyway, so this should be fine.
4 years ago
set_target_properties(MagnumText PROPERTIES DEBUG_POSTFIX "-d")
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(NOT MAGNUM_BUILD_STATIC)
Set library soversion to 1.0, version to 0.
8 years ago
set_target_properties(MagnumText PROPERTIES VERSION ${MAGNUM_LIBRARY_VERSION} SOVERSION ${MAGNUM_LIBRARY_SOVERSION})
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
elseif(MAGNUM_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()
Split the Trade library out.
8 years ago
target_link_libraries(MagnumText PUBLIC
Magnum
CMake: avoid installed Magnum headers being picked over local ones. If Magnum and Corrade get installed into the same directory, target_include_directories() or target_link_libraries() with Corrade before Magnum will result in the (usually stale) installed Magnum headers being picked over the local ones. Which is unwanted, so try to always put the local Magnum include path first. Tested manually by installing to an arbitrary location and editing configure.h to contain an #error. That failed for the Text library, and with these changes it now doesn't fail anymore, but that's not a guarantee that I managed to fix all such cases.
3 years ago
MagnumTextureTools)
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_TARGET_GL)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_link_libraries(MagnumText PUBLIC MagnumGL)
endif()
CMake: avoid installed Magnum headers being picked over local ones. If Magnum and Corrade get installed into the same directory, target_include_directories() or target_link_libraries() with Corrade before Magnum will result in the (usually stale) installed Magnum headers being picked over the local ones. Which is unwanted, so try to always put the local Magnum include path first. Tested manually by installing to an arbitrary location and editing configure.h to contain an #error. That failed for the Text library, and with these changes it now doesn't fail anymore, but that's not a guarantee that I managed to fix all such cases.
3 years ago
# Include dependencies after Magnum itself, to avoid stale installed Magnum
# headers being preferred over the project-local ones
target_link_libraries(MagnumText PUBLIC Corrade::PluginManager)
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
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_WITH_FONTCONVERTER)
if(NOT MAGNUM_TARGET_GL)
message(SEND_ERROR "magnum-fontconverter is available only if MAGNUM_TARGET_GL is enabled")
Document and print helpful error messages for GL-dependent features.
7 years ago
endif()
*converter: make these buildable on platforms w/o dynamic plugins. Such as Emscripten or Android. The hypothetical use case is converting shader files directly on an Android device to debug things, or having a Node.js build of a scene/image converter for "portability". Static plugins can be linked to these if Magnum is built together with Magnum Plugins in a CMake superproject and the plugins are then linked via the MAGNUM_*CONVERTER_STATIC_PLUGINS CMake variable. The fontconverter and distanceconverter tools cause a CMake error on Emscripten as it's not currently possible to access the GPU through a command-line Node.js app. On Android they work though.
3 years ago
if(CORRADE_TARGET_EMSCRIPTEN)
message(SEND_ERROR "The magnum-fontconverter utility isn't available on Emscripten due to lack of GPU access from Node.js. Set MAGNUM_WITH_FONTCONVERTER to OFF to skip building it.")
endif()
Document and print helpful error messages for GL-dependent features.
7 years ago
Link all magnum-* utilities to Corrade::Main. So it's possible to use paths containing Unicode characters with them on Windows.
3 years ago
find_package(Corrade REQUIRED Main)
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)
Split the Trade library out.
8 years ago
target_link_libraries(magnum-fontconverter PRIVATE
Link all magnum-* utilities to Corrade::Main. So it's possible to use paths containing Unicode characters with them on Windows.
3 years ago
Corrade::Main
Split the Trade library out.
8 years ago
Magnum
MagnumText
CMake: add a possibility to link static plugins to utility executables. Funny/sad that this possibility took me so long to realize. Until now it was "you can have command-line utilities or static plugins but never both", and only with CMake 3.13+ it was possible to link static plugins to these executables from outside. Now it's a builtin and supported option.
4 years ago
MagnumTrade
${MAGNUM_FONTCONVERTER_STATIC_PLUGINS})
Replace MAGNUM_TARGET_{HEADLESS,DESKTOP_GLES} with MAGNUM_TARGET_EGL. These two options were mutually exclusive, and both were doing the same thing -- switching to EGL on desktop GL, or switching away from EGL on GLES. That made all logic vastly more complicated than it should be, and unfortunately it took me half a decade to realize that. The new logic is significantly simpler everywhere. As usual, the old options are still recognized by CMake on a deprecated build (with a warning), and are still exposed both as CMake variables and a preprocessor define. But the logic for them was quite complicated, so I don't guarantee all cases are covered. I also tried to clean up the dependent CMake options to allow building GLX and WGL apps on GLES independently of whether EGL is used, but it's quite a mess due to the limitations of CMake < 3.22. Build directories that have the options switched randomly over a long time might start misbehaving, but the initial build should work well.
4 years ago
if(MAGNUM_TARGET_EGL)
Split the Trade library out.
8 years ago
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessEglApplication)
Synchronized windowless app dependencies of all utilities. And document them properly.
10 years ago
elseif(CORRADE_TARGET_IOS)
Split the Trade library out.
8 years ago
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessIosApplication)
Replace MAGNUM_TARGET_{HEADLESS,DESKTOP_GLES} with MAGNUM_TARGET_EGL. These two options were mutually exclusive, and both were doing the same thing -- switching to EGL on desktop GL, or switching away from EGL on GLES. That made all logic vastly more complicated than it should be, and unfortunately it took me half a decade to realize that. The new logic is significantly simpler everywhere. As usual, the old options are still recognized by CMake on a deprecated build (with a warning), and are still exposed both as CMake variables and a preprocessor define. But the logic for them was quite complicated, so I don't guarantee all cases are covered. I also tried to clean up the dependent CMake options to allow building GLX and WGL apps on GLES independently of whether EGL is used, but it's quite a mess due to the limitations of CMake < 3.22. Build directories that have the options switched randomly over a long time might start misbehaving, but the initial build should work well.
4 years ago
elseif(CORRADE_TARGET_APPLE)
Split the Trade library out.
8 years ago
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessCglApplication)
Synchronized windowless app dependencies of all utilities. And document them properly.
10 years ago
elseif(CORRADE_TARGET_UNIX)
Replace MAGNUM_TARGET_{HEADLESS,DESKTOP_GLES} with MAGNUM_TARGET_EGL. These two options were mutually exclusive, and both were doing the same thing -- switching to EGL on desktop GL, or switching away from EGL on GLES. That made all logic vastly more complicated than it should be, and unfortunately it took me half a decade to realize that. The new logic is significantly simpler everywhere. As usual, the old options are still recognized by CMake on a deprecated build (with a warning), and are still exposed both as CMake variables and a preprocessor define. But the logic for them was quite complicated, so I don't guarantee all cases are covered. I also tried to clean up the dependent CMake options to allow building GLX and WGL apps on GLES independently of whether EGL is used, but it's quite a mess due to the limitations of CMake < 3.22. Build directories that have the options switched randomly over a long time might start misbehaving, but the initial build should work well.
4 years ago
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessGlxApplication)
Synchronized windowless app dependencies of all utilities. And document them properly.
10 years ago
elseif(CORRADE_TARGET_WINDOWS)
Replace MAGNUM_TARGET_{HEADLESS,DESKTOP_GLES} with MAGNUM_TARGET_EGL. These two options were mutually exclusive, and both were doing the same thing -- switching to EGL on desktop GL, or switching away from EGL on GLES. That made all logic vastly more complicated than it should be, and unfortunately it took me half a decade to realize that. The new logic is significantly simpler everywhere. As usual, the old options are still recognized by CMake on a deprecated build (with a warning), and are still exposed both as CMake variables and a preprocessor define. But the logic for them was quite complicated, so I don't guarantee all cases are covered. I also tried to clean up the dependent CMake options to allow building GLX and WGL apps on GLES independently of whether EGL is used, but it's quite a mess due to the limitations of CMake < 3.22. Build directories that have the options switched randomly over a long time might start misbehaving, but the initial build should work well.
4 years ago
target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessWglApplication)
Enabled other utilities on Windows.
12 years ago
else()
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
message(FATAL_ERROR "magnum-fontconverter is not available on this platform. Set MAGNUM_WITH_FONTCONVERTER to OFF to suppress this warning.")
Enabled other utilities on Windows.
12 years ago
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()
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_BUILD_TESTS)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
# Library with graceful assert for testing
CMake: exclude test dirs from ALL with CORRADE_TESTSUITE_TEST_TARGET.
4 years ago
add_library(MagnumTextTestLib ${SHARED_OR_STATIC} ${EXCLUDE_FROM_ALL_IF_TEST_TARGET}
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
$<TARGET_OBJECTS:MagnumTextObjects>
${MagnumText_GracefulAssert_SRCS})
CMake: use the CMAKE_FOLDER variable instead of FOLDER property. It limits the support for CMake 3.12+, but it's much less verbose and I don't expect people to use ancient CMake versions with IDEs like Xcode or VS anyway, so this should be fine.
4 years ago
set_target_properties(MagnumTextTestLib PROPERTIES DEBUG_POSTFIX "-d")
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_compile_definitions(MagnumTextTestLib PRIVATE
"CORRADE_GRACEFUL_ASSERT" "MagnumText_EXPORTS")
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_BUILD_STATIC_PIC)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
set_target_properties(MagnumTextTestLib PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
target_link_libraries(MagnumTextTestLib PUBLIC
Magnum
MagnumTextureTools
Corrade::PluginManager)
Prefix all CMake options with MAGNUM_*. Similar to the change done in Corrade, see the commit for details: https://github.com/mosra/corrade/commit/878624ac36d5e1ed6bd973f0a136dcecdeac2919 Wow, this is probably the most backwards-compatibility code I've ever written. Can't wait until I can drop all that.
4 years ago
if(MAGNUM_TARGET_GL)
Text: API-independent base for glyph caches. Allows the Font and FontConverter plugins be built without TARGET_GL enabled. That was the last piece missing for making the magnum-plugins repo completely GL-free.
7 years ago
target_link_libraries(MagnumText PUBLIC MagnumGL)
endif()
CMake: exclude test dirs from ALL with CORRADE_TESTSUITE_TEST_TARGET.
4 years ago
add_subdirectory(Test ${EXCLUDE_FROM_ALL_IF_TEST_TARGET})
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
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)