Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+8
@@ -14,6 +14,14 @@ else()
|
||||
endif()
|
||||
|
||||
|
||||
# <logger.h> from the subdirectories (BSM, Json, VWM, ControlEffects) must
|
||||
# resolve to this directory's logger.h (namespace BuildingControlUnit), as in
|
||||
# the qt5 build. The root CMakeLists puts Lts/Proxies/TrainingAreaBase on the
|
||||
# global include path, which would otherwise shadow it with
|
||||
# TrainingAreaBase/logger.h (whose svctabcommon_export.h lives only in the
|
||||
# build tree), breaking these targets.
|
||||
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
ADD_SUBDIRECTORY(BSM)
|
||||
if(BUILDINGCONTROLJSON_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(Json)
|
||||
|
||||
Reference in new issue
Block a user