Skip to content
Snippets Groups Projects

Gone forward with the porting to Qt6

Merged Rusconi Filippo requested to merge qt6 into master
Files
81
@@ -7,9 +7,6 @@ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
set(LINKER_FLAGS "-Wl,--no-as-needed")
find_package(Qt5 COMPONENTS Core Gui Svg Xml PrintSupport Sql Concurrent Widgets REQUIRED)
find_package(PwizLite REQUIRED)
find_package(ZLIB REQUIRED)
@@ -18,42 +15,26 @@ find_package(Zstd REQUIRED)
find_package(liblzf REQUIRED)
find_package(Qt6 COMPONENTS Widgets Core Gui PrintSupport Svg REQUIRED)
if(BUILD_TESTING)
find_package(QuaZip QUIET)
if(NOT QUAZIP_FOUND)
message(STATUS "QuaZip not yet found. Searching for it.")
set(QuaZip_DIR ${CMAKE_MODULE_PATH})
find_package(QuaZip REQUIRED)
endif()
endif(BUILD_TESTING)
find_package(QCustomPlot REQUIRED)
find_package(QCustomPlotQt6 REQUIRED)
# Per instructions of the lib author:
# https://www.qcustomplot.com/index.php/tutorials/settingup
message(STATUS "Setting definition -DQCUSTOMPLOT_USE_LIBRARY.")
if(NOT TARGET QCustomPlot::QCustomPlot)
add_library(QCustomPlot::QCustomPlot UNKNOWN IMPORTED)
set_target_properties(QCustomPlot::QCustomPlot PROPERTIES
IMPORTED_LOCATION "${QCustomPlot_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${QCustomPlot_INCLUDE_DIR}"
INTERFACE_COMPILE_DEFINITIONS QCUSTOMPLOT_USE_LIBRARY)
endif()
add_definitions(-fPIC)
message("unix-toolchain.cmake - LOCAL_CMAKE_MODULE_PATH: ${LOCAL_CMAKE_MODULE_PATH}")
# Install the cmake module
install(FILES ${CMAKE_MODULE_PATH}/FindPappsoMSpp.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pappsomspp)
message("LOCAL_CMAKE_MODULE_PATH: ${LOCAL_CMAKE_MODULE_PATH}")
install(FILES ${LOCAL_CMAKE_MODULE_PATH}/FindPappsoMSpp.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pappsomspp)
# Configure the cmake config
configure_file (${CMAKE_MODULE_PATH}/PappsoMSppConfig.cmake.in
${CMAKE_BINARY_DIR}/PappsoMSppConfig.cmake)
configure_file (${LOCAL_CMAKE_MODULE_PATH}/PappsoMSppConfig.cmake.in
${CMAKE_BINARY_DIR}/PappsoMSppConfig.cmake)
# Install the cmake config
install(FILES ${CMAKE_BINARY_DIR}/PappsoMSppConfig.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pappsomspp)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pappsomspp)
Loading