Skip to content

Commit

Permalink
Remove linuxdeployqt dependency
Browse files Browse the repository at this point in the history
It isn't really necessary for open-sourcing. Build instructions updated
  • Loading branch information
ahosier committed Jan 2, 2024
1 parent 2076985 commit 05a87f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 26 deletions.
11 changes: 4 additions & 7 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,16 @@ As an alternative, the Qt 5.12.6 offline installer can be used [here][qt-offline
to ~/Qt/Qt5.12.6 (the default of ~/Qt5.12.6 will not work).

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
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 RMV,
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
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
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
Suite download found [here](https://gpuopen.com/tools/).

Run the python pre_build.py in the build folder.
```bash
python3 pre_build.py
```
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
libraries aren't needed). For example:
Or run the pre_build.py script with the -qt option to specify another version of Qt. For example:
```bash
python3 pre_build.py --qt 5.12.6 --disable-extra-qt-lib-deploy
python3 pre_build.py --qt 5.12.6
```
The pre_build.py script will construct the output folders and build the necessary makefiles.
To build the release build, use:
Expand All @@ -92,7 +89,7 @@ mkdir -p ~/Qt/Qt5.15.3/5.15.3/gcc_64
sudo ln -s /usr/lib/x86_64-linux-gnu ~/Qt/Qt5.15.3/5.15.3/gcc_64/lib
sudo ln -s /usr/include/x86_64-linux-gnu/qt5 ~/Qt/Qt5.15.3/5.15.3/gcc_64/include
```
python3 pre_build.py --qt 5.15.3 --qt-system --disable-extra-qt-lib-deploy --build
python3 pre_build.py --qt 5.15.3 --qt-system --build

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

Expand Down
19 changes: 0 additions & 19 deletions cmake/devtools_qt_helper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,6 @@

cmake_minimum_required(VERSION 3.10)

# linuxdeployqt
if (UNIX AND NOT APPLE)
include(FetchContent)
FetchContent_Declare(
linuxdeployqt
URL "http://bdcartifactory.amd.com/artifactory/DevToolsBDC/Assets/radeon_developer_panel/qt6/linuxdeployqt.zip"
SOURCE_DIR ${PROJECT_SOURCE_DIR}/external/linuxdeployqt
DOWNLOAD_EXTRACT_TIMESTAMP true
)
FetchContent_MakeAvailable(linuxdeployqt)

find_program(LINUXDEPLOYQT "linuxdeployqt" HINTS "${PROJECT_SOURCE_DIR}/external/linuxdeployqt")
if (LINUXDEPLOYQT)
message(STATUS "Found linuxdeployqt: ${LINUXDEPLOYQT}")
else ()
message(ERROR "linuxdeployqt not found but is required for build")
endif ()
endif ()

# Attempt to automatically find Qt on the local machine
if (UNIX AND NOT APPLE)
find_package(Qt6 QUIET COMPONENTS Core Widgets Network Gui Svg Test GuiPrivate CorePrivate)
Expand Down

0 comments on commit 05a87f8

Please sign in to comment.