Fix issue #142 (#143)
Some checks failed
CodeQL / Analyze (cpp) (push) Has been cancelled
Doxygen build&deploy / build (push) Has been cancelled
MSVC-CodeAnalysis / Analyze (push) Has been cancelled

This commit is contained in:
Transporter 2024-10-30 22:00:12 +01:00 committed by GitHub
parent 966a537f4a
commit b349f07118
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 34 deletions

View File

@ -32,7 +32,24 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS
add_subdirectory(nodes) add_subdirectory(nodes)
add_subdirectory(parsers) 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 # Installation
jkqtplotter_installlibrary_new(${lib_name} ${libBaseName} ${CMAKE_CURRENT_LIST_DIR}) jkqtplotter_installlibrary_new(${lib_name} ${libBaseName} ${CMAKE_CURRENT_LIST_DIR})

View File

@ -1,24 +0,0 @@
cmake_minimum_required(VERSION 3.23)
# add XITS as aressource
if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
target_sources(${lib_name} PRIVATE
xits.qrc
)
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_XITS)
install(FILES "${CMAKE_CURRENT_LIST_DIR}/xits/OFL.txt" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_LICENSE.txt" )
install(FILES "${CMAKE_CURRENT_LIST_DIR}/xits/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_README.md" )
endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
# add FIRAMATH as aressource
if(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)
target_sources(${lib_name} PRIVATE
firamath.qrc
)
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_FIRAMATH)
install(FILES "${CMAKE_CURRENT_LIST_DIR}/firaMath/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_LICENSE" )
install(FILES "${CMAKE_CURRENT_LIST_DIR}/firaMath/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_README.md" )
endif(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)

View File

@ -68,7 +68,13 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS
add_subdirectory(graphs) add_subdirectory(graphs)
add_subdirectory(gui) 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 # add version info
target_include_directories(${lib_name} PRIVATE ${JKQTPLOTTER_VERSION_FILE_DIR}) target_include_directories(${lib_name} PRIVATE ${JKQTPLOTTER_VERSION_FILE_DIR})

View File

@ -1,8 +0,0 @@
cmake_minimum_required(VERSION 3.23)
# add aressource
target_sources(${lib_name} PRIVATE
jkqtpbaseplotter.qrc
jkqtpstyles.qrc
)