From d50223f1cf03197c127243a34d5b3cd4dea8fa5c Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 16:48:32 +0300 Subject: [PATCH] fix build without Qt --- CMakeLists.txt | 56 ++++++++++++++++++++++-------------------- libs/qt/CMakeLists.txt | 4 ++- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44bd21b..fa2e267 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,44 +13,46 @@ if ("x${CMAKE_MODULE_PATH}" STREQUAL "x") endif() find_package(PIP REQUIRED) - +find_package(QAD) include(SHSTKMacros) -include(QtWraps) shstk_begin_project(cd CD) -include(SHSTKQtMacros) +if(QAD_FOUND) + include(QtWraps) + include(SHSTKQtMacros) -shstk_qt_founded(QtVersions) -foreach(_v ${_QT_VERSIONS_}) - #message("Qt ${_v} -> ${QtVersions}") - option(Qt${_v} "Build for Qt${_v}" ON) -endforeach() + shstk_qt_founded(QtVersions) + foreach(_v ${_QT_VERSIONS_}) + #message("Qt ${_v} -> ${QtVersions}") + option(Qt${_v} "Build for Qt${_v}" ON) + endforeach() -option(UTILS "Build various utils" ${_plugins_default_}) + option(UTILS "Build various utils" ${_plugins_default_}) -macro(cd_library NAME _MODULES _LIBS) - shstk_qt_project(cd_${NAME} FALSE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) - shstk_qt_install("cd" FALSE cd_${NAME} "${out_HDR}" "out_QM") -endmacro() + macro(cd_library NAME _MODULES _LIBS) + shstk_qt_project(cd_${NAME} FALSE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) + shstk_qt_install("cd" FALSE cd_${NAME} "${out_HDR}" "out_QM") + endmacro() -macro(cd_application NAME _MODULES _LIBS) - shstk_qt_project(${NAME} TRUE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) - shstk_qt_install("cd" TRUE ${NAME} "" "out_QM") -endmacro() + macro(cd_application NAME _MODULES _LIBS) + shstk_qt_project(${NAME} TRUE "cd" "${_MODULES}" "${_LIBS}" ${ARGN}) + shstk_qt_install("cd" TRUE ${NAME} "" "out_QM") + endmacro() -macro(cd_plugin NAME _MODULES _LIBS) - shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}") -endmacro() + macro(cd_plugin NAME _MODULES _LIBS) + shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}") + endmacro() -shstk_install(cd FALSE "" "${cd_VERSION_FILE}") -file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") -install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) + shstk_install(cd FALSE "" "${cd_VERSION_FILE}") + file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") + install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) -set(_qt_libs cd_core) -set(_qt_plugs) -set(_qt_apps ) + set(_qt_libs cd_core) + set(_qt_plugs) + set(_qt_apps ) +endif() add_subdirectory(libs) -if (UTILS) +if (UTILS AND QAD_FOUND) add_subdirectory(utils) endif() diff --git a/libs/qt/CMakeLists.txt b/libs/qt/CMakeLists.txt index cea3712..8bdd36b 100644 --- a/libs/qt/CMakeLists.txt +++ b/libs/qt/CMakeLists.txt @@ -1 +1,3 @@ -cd_library(qt "Gui;Widgets" "cd_core;QAD::PIQt;QAD::Graphic") +if (QAD_FOUND) + cd_library(qt "Gui;Widgets" "cd_core;QAD::PIQt;QAD::Graphic") +endif()