Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #142 #143

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Fix issue #142 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion lib/jkqtmathtext/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,24 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS

add_subdirectory(nodes)
add_subdirectory(parsers)
add_subdirectory(resources)

# add XITS as a ressource
if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
qt_add_resources(QRCSOURCES resources/xits.qrc)
target_sources(${lib_name} PRIVATE ${QRCSOURCES})
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_XITS)
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/xits/OFL.txt" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_LICENSE.txt" )
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/xits/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_README.md" )
endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)

# add FIRAMATH as a ressource
if(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)
qt_add_resources(QRCSOURCES resources/firamath.qrc)
target_sources(${lib_name} PRIVATE ${QRCSOURCES})
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_FIRAMATH)
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/firaMath/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_LICENSE" )
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/firaMath/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_README.md" )
endif(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)

# Installation
jkqtplotter_installlibrary_new(${lib_name} ${libBaseName} ${CMAKE_CURRENT_LIST_DIR})
Expand Down
24 changes: 0 additions & 24 deletions lib/jkqtmathtext/resources/CMakeLists.txt
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion lib/jkqtplotter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS

add_subdirectory(graphs)
add_subdirectory(gui)
add_subdirectory(resources)

# add ressource
qt_add_resources(QRCSOURCES
resources/jkqtpbaseplotter.qrc
resources/jkqtpstyles.qrc
)
target_sources(${lib_name} PRIVATE ${QRCSOURCES})

# add version info
target_include_directories(${lib_name} PRIVATE ${JKQTPLOTTER_VERSION_FILE_DIR})
Expand Down
8 changes: 0 additions & 8 deletions lib/jkqtplotter/resources/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading