refactoring...

This commit is contained in:
2020-09-05 01:22:09 +03:00
parent 5a49104273
commit 23b275d17d
65 changed files with 193 additions and 214 deletions

View File

@@ -1,20 +1,22 @@
cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0017 NEW) # need include() with .cmake
project(qad)
set(qad_MAJOR 1)
set(qad_MINOR 9)
set(qad_REVISION 0)
set(qad_SUFFIX )
set(qad_COMPANY SHS)
set(qad_DOMAIN org.SHS)
project(cd)
set(cd_MAJOR 1)
set(cd_MINOR 0)
set(cd_REVISION 0)
set(cd_SUFFIX )
set(cd_COMPANY SHS)
set(cd_DOMAIN org.SHS)
if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
endif()
find_package(PIP REQUIRED)
include(SHSTKMacros)
include(QtWraps)
shstk_begin_project(qad QAD)
shstk_begin_project(cd CD)
include(SHSTKQtMacros)
shstk_qt_founded(QtVersions)
@@ -23,43 +25,41 @@ foreach(_v ${_QT_VERSIONS_})
option(Qt${_v} "Build for Qt${_v}" ON)
endforeach()
if (NOT DEFINED ANDROID_PLATFORM)
find_package(OpenGL REQUIRED)
endif()
#include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
option(UTILS "Build various utils" ${_plugins_default_})
option(DESIGNER_PLUGINS "Build Qt designer plugins" ${_plugins_default_})
macro(qad_library NAME _MODULES _LIBS)
shstk_qt_project(qad_${NAME} FALSE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
shstk_qt_install("qad" FALSE qad_${NAME} "${out_HDR}" "${out_QM}")
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(qad_application NAME _MODULES _LIBS)
shstk_qt_project(${NAME} TRUE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
shstk_qt_install("qad" TRUE ${NAME} "" "${out_QM}")
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(qad_plugin NAME _MODULES _LIBS)
shstk_qt_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}")
macro(cd_plugin NAME _MODULES _LIBS)
shstk_qt_plugin(cd_${NAME} "${_MODULES}" "cd_${NAME};${_LIBS}")
endmacro()
shstk_install(qad FALSE "" "${QAD_VERSION_FILE}")
shstk_install(cd FALSE "" "${CD_VERSION_FILE}")
if (NOT LOCAL)
file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
endif()
set(_qt_libs cd_core)
set(_qt_plugs)
set(_qt_apps )
add_subdirectory(libs)
if (UTILS)
add_subdirectory(utils)
endif()
message("----------QAD----------")
message("----------CD-----------")
message(" Build for ${QtVersions}")
message(" Linkage: ${qad_LIB_TYPE_MSG}")
message(" Type : ${qad_BUILD_TYPE}")
message(" Linkage: ${cd_LIB_TYPE_MSG}")
message(" Type : ${cd_BUILD_TYPE}")
message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
message("")
print_list("${_qt_libs}" " Libraries:" " * ")