more workaround

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

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/rviz2/CMakeLists.txt b/rviz2/CMakeLists.txt
@@ -30,7 +30,7 @@ if(Qt${QT_VERSION_MAJOR}_FOUND AND WIN32 AND TARGET Qt${QT_VERSION_MAJOR}::qmake
   get_target_property(_qt_qmake_location Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
 
   execute_process(
-    COMMAND "${_qt_qmake_location}" -query QT_INSTALL_PREFIX
+    COMMAND "${_qt_qmake_location}" -query QT${QT_VERSION_MAJOR}_INSTALL_PREFIX
     RESULT_VARIABLE return_code
     OUTPUT_VARIABLE qt_install_prefix
     OUTPUT_STRIP_TRAILING_WHITESPACE

diff --git a/rviz_common/CMakeLists.txt b/rviz_common/CMakeLists.txt
@@ -34,6 +34,10 @@ find_package(rviz_ogre_vendor REQUIRED)
 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)
+  endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

diff --git a/rviz_default_plugins/CMakeLists.txt b/rviz_default_plugins/CMakeLists.txt
@@ -60,6 +60,10 @@ find_package(rviz_ogre_vendor REQUIRED)
 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)
+  endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test Widgets)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test Widgets)

diff --git a/rviz_rendering/CMakeLists.txt b/rviz_rendering/CMakeLists.txt
@@ -36,6 +36,10 @@ find_package(rviz_assimp_vendor REQUIRED)
 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)
+  endfunction()
 else()
   find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

diff --git a/rviz_visual_testing_framework/CMakeLists.txt b/rviz_visual_testing_framework/CMakeLists.txt
@@ -49,7 +49,7 @@ if(Qt${QT_VERSION_MAJOR}_FOUND AND WIN32 AND TARGET Qt${QT_VERSION_MAJOR}::qmake
   get_target_property(_qt_qmake_location Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
 
   execute_process(
-    COMMAND "${_qt_qmake_location}" -query QT_INSTALL_PREFIX
+    COMMAND "${_qt_qmake_location}" -query QT${QT_VERSION_MAJOR}_INSTALL_PREFIX
     RESULT_VARIABLE return_code
     OUTPUT_VARIABLE qt_install_prefix
     OUTPUT_STRIP_TRAILING_WHITESPACE