From 7e7252e722437df2d99f69be9bf8c2e4b380a9f1 Mon Sep 17 00:00:00 2001 From: wep21 Date: Sat, 18 May 2024 14:40:13 +0900 Subject: [PATCH] update macro Signed-off-by: wep21 --- rviz_common/CMakeLists.txt | 4 ++-- rviz_default_plugins/CMakeLists.txt | 4 ++-- rviz_rendering/CMakeLists.txt | 4 ++-- rviz_rendering_tests/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rviz_common/CMakeLists.txt b/rviz_common/CMakeLists.txt index 6c3ec5e8d..754c9973b 100644 --- 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 index 2ed54257c..104f09979 100644 --- 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 index 2ebdb5ef4..0b5c0e8c0 100644 --- 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 index bf4f114cd..c815e668b 100644 --- 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)