SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qad v2

Browse Source
This commit is contained in:
Пелипенко Иван
2021-03-19 15:23:57 +03:00
parent 973ee2aa04
commit 664c2a2199
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(qglengine) project(qglengine)
find_package(QAD REQUIRED) find_package(QAD REQUIRED)
find_qt(Qt5 Core Gui OpenGL Xml) qad_find_qt(Qt5 Core Gui OpenGL Xml)
if (NOT Qt5_FOUND) if (NOT Qt5_FOUND)
message(WARNING "Building ${PROJECT_NAME} available only on Qt5!") message(WARNING "Building ${PROJECT_NAME} available only on Qt5!")
else() else()
@@ -21,12 +21,12 @@ else()
shstk_begin_project(qglengine QGLENGINE) shstk_begin_project(qglengine QGLENGINE)
qt_sources(SRC) qad_sources(SRC)
qt_sources(FSRC DIR "formats") qad_sources(FSRC DIR "formats")
list(APPEND SRC ${FSRC}) list(APPEND SRC ${FSRC})
qt_sources(FSRC DIR "core") qad_sources(FSRC DIR "core")
list(APPEND SRC ${FSRC}) list(APPEND SRC ${FSRC})
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
file(GLOB PHS "*_p.h" "formats/*_p.h" "core/*_p.h") file(GLOB PHS "*_p.h" "formats/*_p.h" "core/*_p.h")
list(REMOVE_ITEM out_HDR "${PHS}") list(REMOVE_ITEM out_HDR "${PHS}")
import_version(qglengine_core qglengine) import_version(qglengine_core qglengine)
@@ -36,28 +36,28 @@ else()
COMPANY "${qglengine_COMPANY}" COMPANY "${qglengine_COMPANY}"
INFO "QGLEngine core library") INFO "QGLEngine core library")
make_rc(qglengine_core _RC) make_rc(qglengine_core _RC)
qt_add_library(qglengine_core ${qglengine_LIB_TYPE} out_CPP ${_RC}) qad_add_library(qglengine_core ${qglengine_LIB_TYPE} out_CPP ${_RC})
qt_generate_export_header(qglengine_core) qad_generate_export_header(qglengine_core)
list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/qglengine_core_export.h") list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/qglengine_core_export.h")
list(APPEND out_HDR "${qglengine_VERSION_FILE}") list(APPEND out_HDR "${qglengine_VERSION_FILE}")
qt_target_include_directories(qglengine_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core") qad_target_include_directories(qglengine_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core")
qt_target_link_libraries(qglengine_core QAD::Widgets assimp ${OPENGL_LIBRARIES}) qad_target_link_libraries(qglengine_core QAD::Widgets assimp ${OPENGL_LIBRARIES})
message(STATUS "Building QGLEngine version ${qglengine_VERSION} (${qglengine_LIB_TYPE_MSG})") message(STATUS "Building QGLEngine version ${qglengine_VERSION} (${qglengine_LIB_TYPE_MSG})")
list(APPEND QT_MULTILIB_LIST qglengine_core) list(APPEND QT_MULTILIB_LIST qglengine_core)
add_subdirectory(widgets) add_subdirectory(widgets)
shstk_copy_to_parent() shstk_copy_to_parent()
shstk_qt_install("qglengine" FALSE "qglengine_core" "${out_HDR}" "out_QM") shstk_qad_install("qglengine" FALSE "qglengine_core" "${out_HDR}" "out_QM")
if (NOT DEFINED ANDROID_PLATFORM) if (NOT DEFINED ANDROID_PLATFORM)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
#add_subdirectory(plugin) #add_subdirectory(plugin)
endif() endif()
endif() endif()
qt_sources(test_SRC DIR "qglview_test") qad_sources(test_SRC DIR "qglview_test")
qt_wrap(${test_SRC} CPPS test_CPP) qad_wrap(${test_SRC} CPPS test_CPP)
qt_add_executable(qglengine_test test_CPP) qad_add_executable(qglengine_test test_CPP)
qt_target_link_libraries(qglengine_test qglengine_core qglengine_widgets) qad_target_link_libraries(qglengine_test qglengine_core qglengine_widgets)
qt_target_include_directories(qglengine_test PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core" "${CMAKE_CURRENT_SOURCE_DIR}/widgets") qad_target_include_directories(qglengine_test PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core" "${CMAKE_CURRENT_SOURCE_DIR}/widgets")
file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in") file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules) install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)

16
widgets/CMakeLists.txt
View File

@@ -3,9 +3,9 @@ project(qglengine_widgets)
if (POLICY CMP0017) if (POLICY CMP0017)
cmake_policy(SET CMP0017 NEW) cmake_policy(SET CMP0017 NEW)
endif() endif()
find_qt(Qt5 Core Gui Widgets) qad_find_qt(Qt5 Core Gui Widgets)
qt_sources(SRC) qad_sources(SRC)
qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
file(GLOB PHS "*_p.h") file(GLOB PHS "*_p.h")
list(REMOVE_ITEM out_HDR "${PHS}") list(REMOVE_ITEM out_HDR "${PHS}")
import_version(${PROJECT_NAME} qglengine) import_version(${PROJECT_NAME} qglengine)
@@ -15,12 +15,12 @@ set_deploy_property(${PROJECT_NAME} ${qglengine_LIB_TYPE}
COMPANY "${qglengine_COMPANY}" COMPANY "${qglengine_COMPANY}"
INFO "QGLEngine widgets library") INFO "QGLEngine widgets library")
make_rc(${PROJECT_NAME} _RC) make_rc(${PROJECT_NAME} _RC)
qt_add_library(${PROJECT_NAME} ${qglengine_LIB_TYPE} out_CPP ${_RC}) qad_add_library(${PROJECT_NAME} ${qglengine_LIB_TYPE} out_CPP ${_RC})
qt_generate_export_header(${PROJECT_NAME}) qad_generate_export_header(${PROJECT_NAME})
list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h") list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h")
qt_target_link_libraries(${PROJECT_NAME} QAD::Widgets qglengine_core) qad_target_link_libraries(${PROJECT_NAME} QAD::Widgets qglengine_core)
#qt_target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../core") #qad_target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../core")
list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
shstk_copy_to_parent() shstk_copy_to_parent()
#message(STATUS "Building ${PROJECT_NAME}") #message(STATUS "Building ${PROJECT_NAME}")
shstk_qt_install("qglengine" FALSE "${PROJECT_NAME}" "${out_HDR}" "out_QM") shstk_qad_install("qglengine" FALSE "${PROJECT_NAME}" "${out_HDR}" "out_QM")