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>
89 lines
2.0 KiB
RPMSpec
89 lines
2.0 KiB
RPMSpec
#
|
|
# spec file for package OpenSceneGraph (Version 3.1.7)
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
#
|
|
|
|
%define real_name NGS_addons
|
|
|
|
Name: NGS_addons
|
|
Provides: %{name}
|
|
|
|
Requires: ace
|
|
Requires: NGS
|
|
Requires: ScoreConfiguration
|
|
Requires: ScoreGeometry
|
|
Requires: ScoreGeodesy
|
|
Requires: tao
|
|
|
|
BuildRequires: ace-devel
|
|
BuildRequires: NGS-devel
|
|
BuildRequires: cmake
|
|
BuildRequires: ScoreConfiguration-devel
|
|
BuildRequires: ScoreGeometry-devel
|
|
BuildRequires: ScoreGeodesy-devel
|
|
BuildRequires: tao-devel
|
|
|
|
License: commercial
|
|
Group: System/Libraries
|
|
Summary: NGS - adapter to MAK RTI v4.5.0
|
|
Version: 1.0.1
|
|
Release: 1
|
|
Source: NGSAddOns-master.tar.gz
|
|
Patch1: NGSAddOns-master.patch
|
|
AutoReqProv: no
|
|
|
|
%debug_package
|
|
|
|
%description
|
|
NGS - adapter to MAK RTI v4.5.0
|
|
|
|
%prep
|
|
%setup -q -n NGSAddOns-master
|
|
%patch1 -p1
|
|
|
|
%build
|
|
builddir=%{_builddir}/%{buildsubdir}-build
|
|
rm -rf ${builddir}
|
|
mkdir -p ${builddir}
|
|
cd ${builddir}
|
|
cmake -Wno-dev \
|
|
-DCMAKE_INSTALL_PREFIX=/opt/NGS/NGSPublic \
|
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
-DBUILD_QTSWTESTTOOL=ON \
|
|
-DBUILD_RESCONVERTER=OFF \
|
|
-DBUILD_RESOURCEMONITOR=OFF \
|
|
-DC++11=ON \
|
|
-DSCOREGEOMETRY_ROOT=/opt/NGS/NGSPublic \
|
|
-DTP_ACE_ROOT=/usr \
|
|
-DTP_ACE_TAO_INSTALL=/usr \
|
|
-DTP_BOOST_ROOT=/usr \
|
|
-DTP_NGS_ROOT=/opt/NGS/NGSPublic \
|
|
-DTP_QT_ROOT=/usr \
|
|
-DTP_SCORECONFIGURATION_ROOT=/usr \
|
|
-DTP_SCOREGEODESY_ROOT=/usr \
|
|
-DTP_TAO_ROOT=/usr/share/tao \
|
|
%{_builddir}/%{buildsubdir}
|
|
make %{?_smp_mflags}
|
|
|
|
%install
|
|
builddir=%{_builddir}/%{buildsubdir}-build
|
|
cd ${builddir}
|
|
make DESTDIR=%{buildroot} install %{_smp_mflags}
|
|
|
|
%clean
|
|
%{__rm} -rf '%{buildroot}'
|
|
%{__rm} -rf '%{_builddir}/%{buildsubdir}'
|
|
%{__rm} -rf '%{_builddir}/%{buildsubdir}-build'
|
|
|
|
%files
|
|
%defattr(-,root,root,755)
|
|
/opt/NGS/NGSPublic/exe
|
|
/opt/NGS/NGSPublic/qtswtesttool
|
|
/opt/NGS/NGSPublic/simmonitor
|
|
|
|
%changelog
|
|
* Tue Mar 12 2019 Christian Ehrlicher
|
|
- initial version NGS v14.1.1 / RTIFacade v1.0.1
|