Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ To clone the ishape demo application in your locale repository, do

## Building Cyclone DDS iShapes

From now one, we assume Cylone DDS or Vortex Opensplice and QT5 are installed
From now one, we assume Cylone DDS or Vortex Opensplice and QT6 are installed

### Building on Linux/MacOS with cmake
To build the iShapes demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes:
To build the iShapes demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes:

$ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<qt5_install-location>
$ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<qt6_install-location>

Where <qt5_install-location> is the installation directory of your QT5 installation , e.g (/usr/lib/x86_64_linux-gnu/qt5)
Where <qt6_install-location> is the installation directory of your QT6 installation , e.g (/usr/lib/x86_64_linux-gnu/qt6)


If Cyclone DDS is not installed on the linux default locations ( i.e /usr/lib , /usr/bin ...) you need to update further the LD_LIBRARY_PATH and the PATH env variables. This is described below:
Expand All @@ -64,13 +64,13 @@ To start the real build process go to your iShape-demo root directory and follow


### Building on Windows with cmake
To build the demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes:
To build the demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes:

C:\> set QTDIR=<QT5-INSTALLATION-DIR>
C:\> set QT_PLUGIN_PATH=<QT5-INSTALLATION-DIR>\plugins
C:\> set PATH=<QT5-INSTALLATION-DIR>\bin;%PATH%
C:\> set QTDIR=<QT6-INSTALLATION-DIR>
C:\> set QT_PLUGIN_PATH=<QT6-INSTALLATION-DIR>\plugins
C:\> set PATH=<QT6-INSTALLATION-DIR>\bin;%PATH%

Where <QT5-INSTALLATION-DIR> is the installation directory of your QT5 installation , e.g (<C:\Qt\5.7.1> )
Where <QT6-INSTALLATION-DIR> is the installation directory of your QT6 installation , e.g (<C:\Qt\6.2.4> )

then you need to simply do the following from the iShape demo root directory:

Expand All @@ -87,11 +87,11 @@ Note: please use '--config Debug' if you are using Cyclone DDS debug build to bu

### Building on Linux/MacOS with cmake

To build the iShapes demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes:
To build the iShapes demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes:

$ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<qt5_install-location>
$ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:<qt6_install-location>

Where <qt5_install-location> is the installation directory of your QT5 installation , e.g (/usr/lib/x86_64_linux-gnu/qt5)
Where <qt6_install-location> is the installation directory of your QT6 installation , e.g (/usr/lib/x86_64_linux-gnu/qt6)

then you need to simply do the following from the iShape demo root directory:

Expand All @@ -106,14 +106,14 @@ then you need to simply do the following from the iShape demo root directory:
Note: please use '--config Debug' if you are using Opensplice DDS debug build to build this iShape application.

### Building on Windows with cmake
To build the demo you need to have installed a QT5 development environment. The following QT5 environment variables has to be set in order to build and run ishapes:
To build the demo you need to have installed a QT6 development environment. The following QT6 environment variables has to be set in order to build and run ishapes:

C:\> set QTDIR=<QT5-INSTALLATION-DIR>
C:\> set QT_PLUGIN_PATH=<QT5-INSTALLATION-DIR>\plugins
C:\> set PATH=<QT5-INSTALLATION-DIR>\bin;%PATH%
C:\> set QTDIR=<QT6-INSTALLATION-DIR>
C:\> set QT_PLUGIN_PATH=<QT6-INSTALLATION-DIR>\plugins
C:\> set PATH=<QT6-INSTALLATION-DIR>\bin;%PATH%
C:\> "<ospl_install-location>"\release.bat

Where is the installation directory of your QT5 installation , e.g (<C:\Qt\5.7.1> )
Where is the installation directory of your QT6 installation , e.g (<C:\Qt\6.2.4> )

then you need to simply do the following from the iShape demo root directory:

Expand Down
5 changes: 3 additions & 2 deletions config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
# define IS_HEIGHT 361
# define BRAND_LOGO_X 125
# define BRAND_LOGO_Y 10
# define ISOCPP_LOGO_X 200
#ifdef Ospl
#define ISOCPP_LOGO_X 200
#define ISOCPP_LOGO_Y 305
#elif Cyclone
# define ISOCPP_LOGO_Y 285
#define ISOCPP_LOGO_X 390
#define ISOCPP_LOGO_Y 250
#endif
#else
# define IS_WIDTH 321
Expand Down
Binary file modified images/cyclone-dds-br.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.