✨ 增加 Windows 执行器

.github/workflows/linux-1.x.yml

@@ -10,10 +10,14 @@ on:
 
 jobs:
   cmake-support-x86_64:
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-install.yml@main
+    name: CMake support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-install-u22.yml@main
   minimal-support-x86_64:
+    name: Minimal support for x86_64
     uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-lowest.yml@main
   generic-support-x86_64:
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-generic.yml@main
+    name: Generic support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-generic-u22.yml@main
   gcc14-support-x86_64:
+    name: GCC 14 support for x86_64
     uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-u24.yml@main

.github/workflows/linux-2.x.yml

@@ -10,18 +10,24 @@ on:
 
 jobs:
   cmake-support-x86_64:
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-install.yml@main
+    name: CMake support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-install-u22.yml@main
   withoutdep-support-x86_64:
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-withoutdep.yml@main
+    name: Without dependency support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-withoutdep-u22.yml@main
   python-support-x86_64:
+    name: Python support for x86_64
     needs: withoutdep-support-x86_64
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-pybind.yml@main
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-pybind-u22.yml@main
   minimal-support-x86_64:
+    name: Minimal support for x86_64
     needs: [cmake-support-x86_64, withoutdep-support-x86_64]
     uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-lowest.yml@main
   generic-support-x86_64:
+    name: Generic support for x86_64
     needs: [cmake-support-x86_64, withoutdep-support-x86_64]
-    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-generic.yml@main
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-generic-u22.yml@main
   gcc14-support-x86_64:
+    name: GCC 14 support for x86_64
     needs: [cmake-support-x86_64, withoutdep-support-x86_64]
     uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-u24.yml@main

.github/workflows/windows-2.x.yml

@@ -0,0 +1,17 @@
+name: 2.x in Windows
+
+on:
+  push:
+    branches:
+      - 2.x
+  pull_request:
+    branches:
+      - 2.x
+
+jobs:
+  cmake-support-x86_64:
+    name: CMake support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-install-win.yml@main
+  withoutdep-support-x86_64:
+    name: Without dependency support for x86_64
+    uses: cv-rmvl/ci-workflow/.github/workflows/rmvl-withoutdep-win.yml@main

cmake/RMVLGenConfig.cmake

@@ -68,13 +68,17 @@ __find_imported_modules(optlc OPTLightCtrl)
 
 # 3rdparty (download)
 if(WITH_OPEN62541)
+  list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "if(TARGET open62541::open62541)")
   if(open62541_IN_3RD)
-    list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "include(\$\{RMVL_INSTALL_PATH\}/lib/cmake/open62541/open62541Config.cmake)\n")
+    list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "  include(\$\{RMVL_INSTALL_PATH\}/lib/cmake/open62541/open62541Config.cmake)")
   else()
-    list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "find_package(open62541 REQUIRED)\n")
+    list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "  find_package(open62541 REQUIRED)")
   endif()
+  list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "endif()")
 endif()
 
+string(REPLACE ";" "\n" RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "${RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE}")
+
 # --------------------------------------------------------------------------------------------
 #  Part 2/3: Generate RMVLConfig.cmake
 # --------------------------------------------------------------------------------------------

cmake/RMVLPackaging.cmake

@@ -70,6 +70,12 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${RMVL_VERSION}-${RMVL
 
 # deb options
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "build-essential")
+if(WITH_OPENCV)
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libopencv-dev")
+endif()
+if(BUILD_PYTHON)
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, python3-dev, pybind11-dev")
+endif()
 
 # NSIS options
 set(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}")

cmake/templates/RMVLConfig.cmake.in

@@ -72,29 +72,32 @@ unset(__d)
 # Get imported targets found in Module mode
 @RMVL_MODULES_IMPORTED_CONFIGCMAKE@
 # 3rdparty (download)
-if(WIN32)
-  if(NOT TARGET opencv_world)
-    add_library(opencv_world SHARED IMPORTED)
-    set_target_properties(opencv_world PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${RMVL_INSTALL_PATH}/@RMVL_INCLUDE_INSTALL_PATH@"
-      IMPORTED_IMPLIB "${RMVL_INSTALL_PATH}/@RMVL_3P_LIB_INSTALL_PATH@/@OpenCV_LIB_NAME@"
-      IMPORTED_LOCATION "${RMVL_INSTALL_PATH}/@RMVL_BIN_INSTALL_PATH@/@OpenCV_DLL_NAME@"
-    )
-  endif()
-else()
-  if(NOT TARGET opencv_core)
-    find_package(OpenCV REQUIRED)
+option(WITH_OPENCV "Enable opencv support" @WITH_OPENCV@)
+
+if(WITH_OPENCV)
+  if(WIN32)
+    if(NOT TARGET opencv_world)
+      add_library(opencv_world SHARED IMPORTED)
+      set_target_properties(opencv_world PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${RMVL_INSTALL_PATH}/@RMVL_INCLUDE_INSTALL_PATH@"
+        IMPORTED_IMPLIB "${RMVL_INSTALL_PATH}/@RMVL_3P_LIB_INSTALL_PATH@/@OpenCV_LIB_NAME@"
+        IMPORTED_LOCATION "${RMVL_INSTALL_PATH}/@RMVL_BIN_INSTALL_PATH@/@OpenCV_DLL_NAME@"
+      )
+    endif()
+  else()
+    if(NOT TARGET opencv_core)
+      find_package(OpenCV REQUIRED)
+    endif()
   endif()
 endif()
 
 @RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE@
+
 # Export configuration
 if(NOT TARGET rmvl_core)
   include(${CMAKE_CURRENT_LIST_DIR}/RMVLModules.cmake)
 endif()
 
-option(WITH_OPENCV "Enable opencv support" @WITH_OPENCV@)
-
 # Form list of modules (components) to find
 if(NOT RMVL_FIND_COMPONENTS)
   set(RMVL_FIND_COMPONENTS ${RMVL_LIB_COMPONENTS})

include/rmvlpara/rmvlpara.hpp

@@ -31,6 +31,10 @@
 #include "rmvlpara/opcua.hpp"
 #endif // HAVE_RMVL_OPCUA
 
+#ifdef HAVE_RMVL_LIGHT
+#include "rmvlpara/light.hpp"
+#endif // HAVE_RMVL_LIGHT
+
 /////////////////////////////////////
 ///////     extra modules     ///////
 /////////////////////////////////////

modules/core/include/rmvl/core/version.hpp

@@ -13,9 +13,9 @@
 #include "rmvldef.hpp"
 
 #define RMVL_VERSION_MAJOR 2
-#define RMVL_VERSION_MINOR 2
-#define RMVL_VERSION_PATCH 0
-#define RMVL_VERSION_STATUS "-dev"
+#define RMVL_VERSION_MINOR 1
+#define RMVL_VERSION_PATCH 1
+#define RMVL_VERSION_STATUS ""
 
 #define RMVLAUX_STR_EXP(__A) #__A
 #define RMVLAUX_STR(__A) RMVLAUX_STR_EXP(__A)

modules/light/CMakeLists.txt

@@ -1,13 +1,16 @@
 # ----------------------------------------------------------------------------
 #  Light control module
 # ----------------------------------------------------------------------------
+# light
+rmvl_add_module(light INTERFACE)
+
 # opt_light_control
 find_package(OPTLightCtrl QUIET)
 rmvl_update_build(opt_light_control OPTLightCtrl_FOUND)
 
 rmvl_add_module(
   opt_light_control
-  DEPENDS core
+  DEPENDS core light
 )
 
 rmvl_link_libraries(
@@ -23,7 +26,7 @@ rmvl_generate_para(
 
 rmvl_add_module(
   hik_light_control
-  DEPENDS core
+  DEPENDS core light
 ) 
 
 # ----------------------------------------------------------------------------

modules/light/include/rmvl/light.hpp

@@ -9,6 +9,8 @@
  * 
  */
 
+#pragma once
+
 /**
  * @defgroup light 光源控制器
  * @{