Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -14,7 +14,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsCoordinate
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsCoordinate
|
||||
PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../LtsCoordTrans
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
|
||||
PRIVATE
|
||||
LtsCoordTrans
|
||||
@@ -23,6 +26,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
ADD_SUBDIRECTORY(UnitTest_Coordinate)
|
||||
@@ -93,9 +93,9 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
|
||||
return m_geo;
|
||||
}
|
||||
|
||||
const Core::GeoPosition2D& geoPosition2D() const
|
||||
Core::GeoPosition2D geoPosition2D() const
|
||||
{
|
||||
return m_geo;
|
||||
return Core::GeoPosition2D(m_geo.longitude, m_geo.latitude);
|
||||
}
|
||||
|
||||
const LtsCoordTrans::UtmCoordinate& utmCoordinate() const
|
||||
@@ -107,7 +107,7 @@ class LTSCOORDINATE_EXPORT LtsCoordinate
|
||||
|
||||
double& rz()
|
||||
{
|
||||
return m_geo.z();
|
||||
return m_geo.altitude;
|
||||
}
|
||||
|
||||
double z() const
|
||||
|
||||
Reference in new issue
Block a user