update macro

Signed-off-by: wep21 <[email protected]>
ros2 · May 18, 2024 · 7e7252e · 7e7252e
1 parent 5859791
commit 7e7252e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/rviz_common/CMakeLists.txt b/rviz_common/CMakeLists.txt
@@ -35,8 +35,8 @@ if(MSVC)
   set(QT_VERSION_MAJOR 5)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
   function(qt_wrap_cpp out)
-    qt5_wrap_cpp(_sources ${ARGN})
-    set("${out}" ${_sources} PARENT_SCOPE)
+    qt5_wrap_cpp("${out}" ${ARGN})
+    set("${out}" "${${out}}" PARENT_SCOPE)
   endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)

diff --git a/rviz_default_plugins/CMakeLists.txt b/rviz_default_plugins/CMakeLists.txt
@@ -61,8 +61,8 @@ if(MSVC)
   set(QT_VERSION_MAJOR 5)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets)
   function(qt_wrap_cpp out)
-    qt5_wrap_cpp(_sources ${ARGN})
-    set("${out}" ${_sources} PARENT_SCOPE)
+    qt5_wrap_cpp("${out}" ${ARGN})
+    set("${out}" "${${out}}" PARENT_SCOPE)
   endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test Widgets)

diff --git a/rviz_rendering/CMakeLists.txt b/rviz_rendering/CMakeLists.txt
@@ -37,8 +37,8 @@ if(MSVC)
   set(QT_VERSION_MAJOR 5)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
   function(qt_wrap_cpp out)
-    qt5_wrap_cpp(_sources ${ARGN})
-    set("${out}" ${_sources} PARENT_SCOPE)
+    qt5_wrap_cpp("${out}" ${ARGN})
+    set("${out}" "${${out}}" PARENT_SCOPE)
   endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)

diff --git a/rviz_rendering_tests/CMakeLists.txt b/rviz_rendering_tests/CMakeLists.txt
@@ -36,8 +36,8 @@ if(BUILD_TESTING)
     set(QT_VERSION_MAJOR 5)
     find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
     function(qt_wrap_cpp out)
-      qt5_wrap_cpp(_sources ${ARGN})
-      set("${out}" ${_sources} PARENT_SCOPE)
+      qt5_wrap_cpp("${out}" ${ARGN})
+      set("${out}" "${${out}}" PARENT_SCOPE)
     endfunction()
   else()
     find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)