Behebt strikt nur die verbleibenden CMake legacy command Fehler im Docker-Build der Qt6-Migration.
This commit is contained in:
4 files changed
+21
No files matched your search
@@ -5,6 +5,11 @@
|
|||||||
# Created by Christian Ehrlicher, SLSE, 2016-02-29
|
# Created by Christian Ehrlicher, SLSE, 2016-02-29
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Suppress CMP0167 warning: FindBoost module is removed in CMake 3.30+
|
||||||
|
if(POLICY CMP0167)
|
||||||
|
cmake_policy(SET CMP0167 OLD)
|
||||||
|
endif()
|
||||||
|
|
||||||
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
||||||
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
||||||
ELSE()
|
ELSE()
|
||||||
|
|||||||
@@ -4,6 +4,11 @@
|
|||||||
# $Author$
|
# $Author$
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Suppress CMP0167 warning: FindBoost module is removed in CMake 3.30+
|
||||||
|
if(POLICY CMP0167)
|
||||||
|
cmake_policy(SET CMP0167 OLD)
|
||||||
|
endif()
|
||||||
|
|
||||||
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
||||||
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
||||||
ELSE()
|
ELSE()
|
||||||
|
|||||||
@@ -29,6 +29,12 @@
|
|||||||
|
|
||||||
|
|
||||||
SET(_rti_gcc_arch "")
|
SET(_rti_gcc_arch "")
|
||||||
|
|
||||||
|
# Suppress CMP0153 warning: EXEC_PROGRAM is deprecated
|
||||||
|
if(POLICY CMP0153)
|
||||||
|
cmake_policy(SET CMP0153 OLD)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Check if RTI_DIR is not set OR is empty (cached empty string from previous failed detection)
|
# Check if RTI_DIR is not set OR is empty (cached empty string from previous failed detection)
|
||||||
IF(NOT RTI_DIR OR RTI_DIR STREQUAL "")
|
IF(NOT RTI_DIR OR RTI_DIR STREQUAL "")
|
||||||
# First check RTI_INSTALL_DIR CMake variable (set by parent CMakeLists.txt)
|
# First check RTI_INSTALL_DIR CMake variable (set by parent CMakeLists.txt)
|
||||||
|
|||||||
@@ -33,6 +33,11 @@
|
|||||||
|
|
||||||
INCLUDE(GenerateExportHeader)
|
INCLUDE(GenerateExportHeader)
|
||||||
|
|
||||||
|
# Suppress CMP0177 warning: install() DESTINATION normalization
|
||||||
|
if(POLICY CMP0177)
|
||||||
|
cmake_policy(SET CMP0177 OLD)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Compatibility stubs for Qt5 CMake macros when Qt6 is used.
|
# Compatibility stubs for Qt5 CMake macros when Qt6 is used.
|
||||||
# These stubs allow configure to succeed; actual resource/ui generation should be addressed during source migration.
|
# These stubs allow configure to succeed; actual resource/ui generation should be addressed during source migration.
|
||||||
if(NOT COMMAND QT5_ADD_RESOURCES)
|
if(NOT COMMAND QT5_ADD_RESOURCES)
|
||||||
|
|||||||
Reference in new issue
Block a user