torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
59 lines
1.5 KiB
Prolog
59 lines
1.5 KiB
Prolog
#-------------------------------------------------
|
|
# Copyright 2015 Esri.
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at:
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#-------------------------------------------------
|
|
|
|
mac {
|
|
cache()
|
|
}
|
|
|
|
CONFIG += c++11 esri_runtime_qt100_0_0 debug
|
|
|
|
QT += core gui opengl xml network positioning sensors
|
|
|
|
win32:CONFIG += \
|
|
embed_manifest_exe
|
|
|
|
TARGET = LocationViewshed
|
|
TEMPLATE = app
|
|
|
|
SOURCES += \
|
|
main.cpp \
|
|
ViewshedLocation.cpp
|
|
|
|
HEADERS += \
|
|
ViewshedLocation.h
|
|
|
|
|
|
win32 {
|
|
INCLUDEPATH += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/include"
|
|
debug:LIBPATH += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/windows/x64/lib/Debug"
|
|
release:LIBPATH += "C:/Program Files (x86)/ArcGIS SDKs/Qt100.0/sdk/windows/x64/lib/Release"
|
|
debug:LIBS += -lEsriCommonQtd
|
|
release:LIBS += -lEsriCommonQt
|
|
debug:LIBS += -lEsriRuntimeQtd
|
|
release:LIBS += -lEsriRuntimeQt
|
|
}
|
|
|
|
linux {
|
|
INCLUDEPATH += /usr/include/arcgis
|
|
LIBS += -lEsriCommonQt
|
|
LIBS += -lEsriRuntimeQt
|
|
LIBS += -lc++
|
|
}
|
|
|
|
|
|
macx {
|
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
|
|
}
|