Revert cmake version to 3.1

Remove big resources
Remove embedded special fonts
This commit is contained in:
Julien Wadel 2020-06-20 18:29:30 +02:00
parent 2f586bfb08
commit 902ba80e00
10 changed files with 8 additions and 14 deletions

View file

@ -20,9 +20,7 @@
#
################################################################################
cmake_minimum_required(VERSION 3.9)
#3.9 for qt5_add_big_resources
cmake_minimum_required(VERSION 3.1)
get_cmake_property(vars CACHE_VARIABLES)
foreach(var ${vars})

View file

@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
################################################################################
cmake_minimum_required(VERSION 3.9)
cmake_minimum_required(VERSION 3.1)
project(linphoneqt VERSION 4.2.0)
@ -257,7 +257,9 @@ else ()
endif ()
set(QRC_RESOURCES resources.qrc)
qt5_add_big_resources(QRC_BIG_RESOURCES resources.qrc)
#qt5_add_big_resources(QRC_BIG_RESOURCES resources.qrc) #Use this macro if resources size is too high
set(LANGUAGES_DIRECTORY "${ASSETS_DIR}/languages")
set(I18N_FILENAME i18n.qrc)
set(LANGUAGES da de en es fr_FR hu it ja lt pt_BR ru sv tr uk zh_CN)
@ -359,8 +361,8 @@ list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_DIRECTORY}/${I18N_F
get_directory_property(TS_FILES DIRECTORY "${LANGUAGES_DIRECTORY}" DEFINITION TS_FILES)
list(APPEND SOURCES ${TS_FILES})
#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES})
add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES})
add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES} ${QRC_RESOURCES})
#add_library(${APP_LIBRARY} OBJECT ${SOURCES} ${HEADERS} ${QML_SOURCES})
if(TARGET_NAME_ONLY)
add_library(${APP_LIBRARY_ONLY} OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS} ${QML_SOURCES}})
endif()

View file

@ -50,7 +50,7 @@ set(LRELEASE_OPTIONS "")
#Clean existing generated file to force re-creation
file(REMOVE ${QM_FILES})
file(REMOVE ${TARGET_TS_FILES})
file(REMOVE ${QRC_BIG_RESOURCES})
#file(REMOVE ${QRC_BIG_RESOURCES}) #Remove .o of resources before build. It is need to update resources from changes
add_custom_command(OUTPUT ${TARGET_TS_FILES}
COMMAND ${Qt5_LUPDATE_EXECUTABLE}

View file

@ -481,11 +481,5 @@
<file>ui/dev-modules/Colors/Colors.qml</file>
<file>ui/dev-modules/Units/Units.qml</file>
<file>assets/icon.ico</file>
<file>assets/fonts/NotoSans-hinted/NotoSansCJKjp-Regular.otf</file>
<file>assets/fonts/NotoSans-hinted/NotoSansCJKjp-Bold.otf</file>
<file>assets/fonts/NotoSans-hinted/NotoColorEmoji.ttf</file>
<file>assets/fonts/NotoSans-hinted/NotoEmoji-Regular.ttf</file>
<file>assets/fonts/NotoSans-hinted/NotoSansSC-Bold.otf</file>
<file>assets/fonts/NotoSans-hinted/NotoSansSC-Regular.otf</file>
</qresource>
</RCC>