diff --git a/CMakeLists.txt b/CMakeLists.txt index b41b8db..d489f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,8 @@ set(LIBPROJECT 1) if(NOT DEFINED BUILD_NUMBER) set(BUILD_NUMBER 9999) endif() +set(_COMPANY SHS) +set(_DOMAIN org.SHS) include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip) if(MINGW) find_package(MinGW REQUIRED) diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt index ec86bd5..72562f3 100644 --- a/qglengine/CMakeLists.txt +++ b/qglengine/CMakeLists.txt @@ -28,11 +28,6 @@ else() BUILD "${BUILD_NUMBER}" SUFFIX prealpha OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/core/qglengine_version.h") - set_deploy_property(qglengine_core ${PIP_LIB_TYPE} - LABEL "QGLEngine core library" - FULLNAME "org.SHS.qglengine_core" - COMPANY "SHS" - INFO "QGLEngine core library") qt_sources(SRC) qt_sources(FSRC DIR "formats") @@ -42,10 +37,17 @@ else() qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) file(GLOB PHS "*_p.h" "formats/*_p.h" "core/*_p.h") list(REMOVE_ITEM out_HDR "${PHS}") - qt_add_library(qglengine_core SHARED out_CPP) + import_version(qglengine_core qglengine) + set_deploy_property(qglengine_core SHARED + LABEL "QGLEngine core library" + FULLNAME "${_DOMAIN}.qglengine_core" + COMPANY "${_COMPANY}" + INFO "QGLEngine core library") + make_rc(qglengine_core _RC) + qt_add_library(qglengine_core SHARED out_CPP ${_RC}) qt_target_include_directories(qglengine_core PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core") qt_target_link_libraries(qglengine_core qad_utils qad_widgets assimp ${OPENGL_LIBRARIES}) - message(STATUS "Building qglengine_core") + message(STATUS "Building QGLEengine version ${qglengine_VERSION} (SHARED)") list(APPEND QT_MULTILIB_LIST qglengine_core) add_subdirectory(widgets) set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) diff --git a/qglengine/core/gltypes.h b/qglengine/core/gltypes.h index 54e1f1b..20eced1 100644 --- a/qglengine/core/gltypes.h +++ b/qglengine/core/gltypes.h @@ -78,6 +78,7 @@ # include #endif #include +#include "qglengine_version.h" //#ifdef WINDOWS diff --git a/qglengine/widgets/CMakeLists.txt b/qglengine/widgets/CMakeLists.txt index 9a9eae8..f650aaa 100644 --- a/qglengine/widgets/CMakeLists.txt +++ b/qglengine/widgets/CMakeLists.txt @@ -8,12 +8,19 @@ qt_sources(SRC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) file(GLOB PHS "*_p.h") list(REMOVE_ITEM out_HDR "${PHS}") -qt_add_library(${PROJECT_NAME} SHARED out_CPP) +import_version(${PROJECT_NAME} qglengine) +set_deploy_property(${PROJECT_NAME} SHARED + LABEL "QGLEngine widgets library" + FULLNAME "${_DOMAIN}.${PROJECT_NAME}" + COMPANY "${_COMPANY}" + INFO "QGLEngine widgets library") +make_rc(${PROJECT_NAME} _RC) +qt_add_library(${PROJECT_NAME} SHARED out_CPP ${_RC}) qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qglengine_core) qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../core") list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME}) set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE) -message(STATUS "Building ${PROJECT_NAME}") +#message(STATUS "Building ${PROJECT_NAME}") if (LIBPROJECT) sdk_install("qglengine" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}") else() @@ -24,7 +31,7 @@ else() qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${MINGW_BIN}) qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION QtBin) else() - qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qglengine) + qt_install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qglengine) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")