Skip to content

Commit b349f07

Browse files
Fix issue #142 (#143)
1 parent 966a537 commit b349f07

File tree

4 files changed

+25
-34
lines changed

4 files changed

+25
-34
lines changed

lib/jkqtmathtext/CMakeLists.txt

+18-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,24 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS
3232

3333
add_subdirectory(nodes)
3434
add_subdirectory(parsers)
35-
add_subdirectory(resources)
35+
36+
# add XITS as a ressource
37+
if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
38+
qt_add_resources(QRCSOURCES resources/xits.qrc)
39+
target_sources(${lib_name} PRIVATE ${QRCSOURCES})
40+
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_XITS)
41+
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/xits/OFL.txt" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_LICENSE.txt" )
42+
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/xits/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_XITS_README.md" )
43+
endif(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
44+
45+
# add FIRAMATH as a ressource
46+
if(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)
47+
qt_add_resources(QRCSOURCES resources/firamath.qrc)
48+
target_sources(${lib_name} PRIVATE ${QRCSOURCES})
49+
target_compile_definitions(${lib_name} PUBLIC JKQTMATHTEXT_COMPILED_WITH_FIRAMATH)
50+
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/firaMath/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_LICENSE" )
51+
install(FILES "${CMAKE_CURRENT_LIST_DIR}/resources/firaMath/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME "${lib_name}_FIRAMATH_README.md" )
52+
endif(JKQtPlotter_BUILD_INCLUDE_FIRAMATH_FONTS)
3653

3754
# Installation
3855
jkqtplotter_installlibrary_new(${lib_name} ${libBaseName} ${CMAKE_CURRENT_LIST_DIR})

lib/jkqtmathtext/resources/CMakeLists.txt

-24
This file was deleted.

lib/jkqtplotter/CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,13 @@ target_sources(${lib_name} PUBLIC FILE_SET HEADERS TYPE HEADERS
6868

6969
add_subdirectory(graphs)
7070
add_subdirectory(gui)
71-
add_subdirectory(resources)
71+
72+
# add ressource
73+
qt_add_resources(QRCSOURCES
74+
resources/jkqtpbaseplotter.qrc
75+
resources/jkqtpstyles.qrc
76+
)
77+
target_sources(${lib_name} PRIVATE ${QRCSOURCES})
7278

7379
# add version info
7480
target_include_directories(${lib_name} PRIVATE ${JKQTPLOTTER_VERSION_FILE_DIR})

lib/jkqtplotter/resources/CMakeLists.txt

-8
This file was deleted.

0 commit comments

Comments
 (0)