Skip to content

Commit

Permalink
Don't search for qwt-polar with Qwt>=6.2
Browse files Browse the repository at this point in the history
It is now part of qwt.
  • Loading branch information
MehdiChinoune committed Nov 14, 2023
1 parent a2643b8 commit 720d22d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/mingw-w64-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ jobs:
-DWITH_PDAL=OFF \
-DWITH_CUSTOM_WIDGETS=ON \
-DWITH_QWTPOLAR=ON \
-DQWTPOLAR_LIBRARY=${MINGW_PREFIX}/lib/libqwt-qt5.dll.a \
-DQWTPOLAR_INCLUDE_DIR=${MINGW_PREFIX}/include/qwt-qt5 \
-DWITH_INTERNAL_QWTPOLAR=OFF \
-DWITH_BINDINGS=OFF \
-DWITH_GRASS=OFF \
-DWITH_DRACO=OFF \
Expand Down
14 changes: 10 additions & 4 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,17 @@ endif()
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.")

if (WITH_QWTPOLAR)
# 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)
add_definitions(-DWITH_QWTPOLAR)
# Try to find QwtPolar on the system
find_package(QwtPolar)

if(Qwt_VERSION_STRING 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})
endif()
# If not found on the system, offer the possibility to build QwtPolar
# internally
if(NOT FOUND_QwtPolar)
Expand Down

0 comments on commit 720d22d

Please sign in to comment.