Skip to content

Commit 096d95d

Browse files
committed
Remove linuxdeployqt dependency
It isn't really necessary for open-sourcing. Build instructions updated
1 parent ca339bf commit 096d95d

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

BUILD.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,16 @@ As an alternative, the Qt 5.12.6 offline installer can be used [here][qt-offline
5656
to ~/Qt/Qt5.12.6 (the default of ~/Qt5.12.6 will not work).
5757

5858
XCB libraries are required for Qt v5.15.x (they are not needed for older Qt versions). By default, the CMake configuration will attempt to copy
59-
these files from the Qt lib folder. If these files are installed elsewhere on the system or an older version of Qt is being used to build RRA,
60-
the --disable-extra-qt-lib-deploy pre_build.py script argument may be used. This will prevent the build configuration scripts from attempting to copy
61-
the libraries in the post build step. If needed, the XCB library files (libxcb*) can be obtained from the /lib folder of the Radeon Developer Tool
59+
these files from the Qt lib folder. If needed, the XCB library files (libxcb*) can be obtained from the /lib folder of the Radeon Developer Tool
6260
Suite download found [here](https://gpuopen.com/tools/).
6361

6462
Run the python pre_build.py in the build folder.
6563
```bash
6664
python3 pre_build.py
6765
```
68-
Or run the pre_build.py script with the -qt option to specify another version of Qt (also use the --disable-extra-qt-lib-deploy flag since the XCB
69-
libraries aren't needed). For example:
66+
Or run the pre_build.py script with the -qt option to specify another version of Qt. For example:
7067
```bash
71-
python3 pre_build.py --qt 5.12.6 --disable-extra-qt-lib-deploy
68+
python3 pre_build.py --qt 5.12.6
7269
```
7370
The pre_build.py script will construct the output folders and build the necessary makefiles.
7471
To build the release build, use:
@@ -92,7 +89,7 @@ mkdir -p ~/Qt/Qt5.15.3/5.15.3/gcc_64
9289
sudo ln -s /usr/lib/x86_64-linux-gnu ~/Qt/Qt5.15.3/5.15.3/gcc_64/lib
9390
sudo ln -s /usr/include/x86_64-linux-gnu/qt5 ~/Qt/Qt5.15.3/5.15.3/gcc_64/include
9491
```
95-
python3 pre_build.py --qt 5.15.3 --qt-system --disable-extra-qt-lib-deploy --build
92+
python3 pre_build.py --qt 5.15.3 --qt-system --build
9693

9794
Some additional Qt components may be required, so install those:
9895

cmake/devtools_qt_helper.cmake

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@
55

66
cmake_minimum_required(VERSION 3.10)
77

8-
# linuxdeployqt
9-
if (UNIX AND NOT APPLE)
10-
include(FetchContent)
11-
FetchContent_Declare(
12-
linuxdeployqt
13-
URL "http://bdcartifactory.amd.com/artifactory/DevToolsBDC/Assets/radeon_developer_panel/qt6/linuxdeployqt.zip"
14-
SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/linuxdeployqt
15-
DOWNLOAD_EXTRACT_TIMESTAMP true
16-
)
17-
FetchContent_MakeAvailable(linuxdeployqt)
18-
19-
find_program(LINUXDEPLOYQT "linuxdeployqt" HINTS "${PROJECT_SOURCE_DIR}/external/linuxdeployqt")
20-
if (LINUXDEPLOYQT)
21-
message(STATUS "Found linuxdeployqt: ${LINUXDEPLOYQT}")
22-
else ()
23-
message(ERROR "linuxdeployqt not found but is required for build")
24-
endif ()
25-
endif ()
26-
278
# Attempt to automatically find Qt on the local machine
289
if (UNIX AND NOT APPLE)
2910
find_package(Qt6 QUIET COMPONENTS Core Widgets Network Gui Svg Test GuiPrivate CorePrivate)

0 commit comments

Comments
 (0)