diff --git a/.gitignore b/.gitignore index 13e8879..9f884ce 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,4 @@ pyvenv.cfg pip-selfcheck.json build/ +packages/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c56428..cd9efe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 3.0.4) -project(RTest) +project(RTest + VERSION 0.5.0) + +set(BUILD_NUMBER "0" CACHE STRING "Build-Number") + +set(VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}+${BUILD_NUMBER}) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -28,12 +33,12 @@ qt5_add_resources(RTEST_RSCS_SRCS add_library(rtest SHARED ${SRCS} ${RTEST_RSCS_SRCS}) add_library(rtests STATIC ${SRCS}) -target_link_libraries(rtest Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Qml Qt5::Network) +target_link_libraries(rtest Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Qml) target_link_libraries(rtest rcomm) target_link_libraries(rtest rregistry) target_link_libraries(rtest rsupport) -target_link_libraries(rtests Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Qml Qt5::Network) +target_link_libraries(rtests Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Qml) target_link_libraries(rtests rcomm) target_link_libraries(rtests rregistrys) target_link_libraries(rtests rsupports) @@ -60,3 +65,22 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/RBase/swig/python/_RSupport.so DESTINATION share/RTest/python3 ) + +set(CPACK_GENERATOR "DEB") + +set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fully integrated regulation kernel test-tool for VERNER RKs.") +set(CPACK_PACKAGE_NAME "RTest") +set(CPACK_PACKAGE_VENDOR "Harptech") +set(CPACK_PACKAGE_VERSION ${VERSION}) +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) +set(CPACK_RESSOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md) +set(CPACK_RESSOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README.md) +set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/packages) +set(CPACK_PACKAGE_CONTACT "Max Heisinger ") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, python3-numpy, libpython3.4, qml-module-qtquick-controls, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick2, libqt5widgets5, libqt5gui5, libqt5quick5, libqt5qml5, libqt5quickwidgets5, swig") +set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64") + +include(CPack) diff --git a/RBase b/RBase index 10e1820..663074d 160000 --- a/RBase +++ b/RBase @@ -1 +1 @@ -Subproject commit 10e18207d862c7b34bd422f4602b617aebd7e6a1 +Subproject commit 663074d3c39d3ca3123ff63bb92751aff53a7fa7