Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix check for Qwt>=6.2.0 for QWT_POLAR #57023

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Fix check for Qwt>=6.2.0 for QWT_POLAR #57023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78305b5
Fix check for Qwt>=6.2.0 for QWT_POLAR
MehdiChinoune Apr 2, 2024
97b19f4
Replace `docker-compose` by `docker compose`
MehdiChinoune Apr 2, 2024
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
2 changes: 0 additions & 2 deletions .github/workflows/mingw-w64-msys2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:

- name: Configure QGIS
run: |
CXXFLAGS="-DQWT_POLAR_VERSION=0x060200" \
cmake \
-G"Ninja" \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
Expand All @@ -74,7 +73,6 @@ jobs:
-DWITH_DRACO=ON \
-DWITH_PDAL=OFF \
-DWITH_CUSTOM_WIDGETS=ON \
-DWITH_QWTPOLAR=OFF \
-DWITH_BINDINGS=OFF \
-DWITH_GRASS=OFF \
-DUSE_CCACHE=ON \
Expand Down
7 changes: 4 additions & 3 deletions src/app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,16 @@ find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)

set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar is available or whether functionality requiring QwtPolar should be disabled.")
# Once we bump the minimum QWT VERSION to 6.2 or newer, we should get rid of WITH_QWTPOLAR
if(Qwt_VERSION_STRING VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)
if(QWT_VERSION_STR VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)
add_definitions(-DWITH_QWTPOLAR)

if(Qwt_VERSION_STRING VERSION_LESS 6.2)
if(QWT_VERSION_STR VERSION_LESS 6.2)
find_package(QwtPolar REQUIRED)
else()
set(FOUND_QwtPolar TRUE)
set(QWTPOLAR_LIBRARY ${QWT_LIBRARY})
set(QWTPOLAR_INCLUDE_DIR ${QWT_INCLUDE_DIR})
add_definitions(-DQWT_POLAR_VERSION=0x060200)
endif()
# If not found on the system, offer the possibility to build QwtPolar
# internally
Expand All @@ -403,7 +404,7 @@ if(Qwt_VERSION_STRING VERSION_GREATER_EQUAL 6.2 OR WITH_QWTPOLAR)
else()
set(DEFAULT_WITH_INTERNAL_QWTPOLAR FALSE)
endif()
set (WITH_INTERNAL_QWTPOLAR DEFAULT_WITH_INTERNAL_QWTPOLAR CACHE BOOL "Use internal build of QwtPolar")
set (WITH_INTERNAL_QWTPOLAR ${DEFAULT_WITH_INTERNAL_QWTPOLAR} CACHE BOOL "Use internal build of QwtPolar")

if(WITH_INTERNAL_QWTPOLAR)
set(QGIS_APP_SRCS
Expand Down
Loading