--- CMakeLists.txt 2020-01-20 22:04:42.000000000 +0000 +++ CMakeLists.txt 2020-08-24 20:11:44.636000000 +0000 @@ -20,7 +20,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Deb cmake_minimum_required(VERSION 2.6) # Disable ruby support by default -SET(NO_RUBY 1) +OPTION(NO_RUBY "Disable ruby binding building" ON) # Enable make uninstall rule CONFIGURE_FILE( --- src/CMakeLists.txt 2020-01-20 22:04:42.000000000 +0000 +++ src/CMakeLists.txt 2020-08-24 23:19:01.860000000 +0000 @@ -786,10 +794,9 @@ INSTALL( DIRECTORY ${Canorus_Scripts} DE # Install translations INSTALL(FILES ${Canorus_Translation_Bins} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/lang") # Install fonts -INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts") +SET(TTF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts" CACHE PATH "True-type fonts installation folder") +INSTALL(FILES ${Canorus_Fonts} DESTINATION ${TTF_INSTALL_DIR}) # Install users manual, if it exists -INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)") -INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)") FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch) INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide") # Install examples --- src/CMakeLists.txt~ 2021-10-12 16:12:10.457000000 +0000 +++ src/CMakeLists.txt 2021-10-12 16:27:44.228000000 +0000 @@ -14,7 +14,7 @@ IF(NOT CMAKE_BUILD_TYPE) ENDIF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fstack-protector-all -Wall -Werror -Wuninitialized -Wtype-limits -Wstack-protector") -SET(CMAKE_C_FLAGS_RELEASE "-O2") +SET(CMAKE_C_FLAGS_RELEASE "-O2 -Wno-error=deprecated-declarations -Wno-error=return-type -Wno-deprecated-declarations -Wno-return-type -Wno-unused-variable -Wno-error") SET(CMAKE_CXX_STANDARD 14) @@ -632,7 +632,7 @@ IF(USE_RUBY) SOURCES ${Canorus_Swig_Srcs} ${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusruby.i ) SWIG_LINK_LIBRARIES(CanorusRuby ${RUBY_LIBRARY} Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Svg Qt5::Xml Qt5::PrintSupport) - SET_TARGET_PROPERTIES( ${SWIG_MODULE_CanorusRuby_REAL_NAME} PROPERTIES COMPILE_FLAGS "-DSWIGCPP" ) + SET_TARGET_PROPERTIES( ${SWIG_MODULE_CanorusRuby_REAL_NAME} PROPERTIES COMPILE_FLAGS "-DSWIGCPP -Wno-error=deprecated-declarations -Wno-return-type" ) ENDIF(USE_RUBY) IF(USE_PYTHON)