-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
qwt: Update to work with Qt 5 or 6 #21391
base: master
Are you sure you want to change the base?
qwt: Update to work with Qt 5 or 6 #21391
Conversation
This comment has been minimized.
This comment has been minimized.
8370fcf
to
0fcf732
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
313ffd5
to
619ee29
Compare
This comment has been minimized.
This comment has been minimized.
Could you include this minor change in your PR as well, please? #21196 |
@valgur I can do that if you want, not sure of the best way to do that? |
Thanks! You can simply copy the changed line and mention the other PR in the commit message for context info. |
This comment has been minimized.
This comment has been minimized.
6f8990a
to
644c082
Compare
This comment has been minimized.
This comment has been minimized.
644c082
to
242dc58
Compare
This comment has been minimized.
This comment has been minimized.
242dc58
to
ca8f32f
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
0548826
to
6fb0218
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Waiting on #21676 to fix Windows Qt6 build |
071f130
to
828835b
Compare
This comment has been minimized.
This comment has been minimized.
I'm just following up on this PR |
828835b
to
ffd7240
Compare
Conan v1 pipeline ✔️All green in build 8 (
Conan v2 pipeline ❌
The v2 pipeline failed. Please, review the errors and note this is required for pull requests to be merged. In case this recipe is still not ported to Conan 2.x, please, ping Failure in build 8 (
Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability. |
ffd7240
to
5eab37d
Compare
5eab37d
to
892d043
Compare
Co-authored-by: Jordan Williams <jordan@jwillikers.com> qwt: use a more specific license identifier
892d043
to
bd5d392
Compare
Hi @AbrilRBS, Just requesting some help with this PR. |
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
not stale |
@ashley-b thanks for your PR! I encountered the same problem when compiling qwt with qt6 (as in #16326) and came up with a similar solution. My patch looks like this: diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9158c..96a507d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,28 +7,6 @@ project(Qwt
LANGUAGES CXX
)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /permissive-")
-else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wcast-qual \
- -Wcast-align -Wredundant-decls -Wformat -Wshadow -Woverloaded-virtual \
- -fno-math-errno -funsafe-math-optimizations")
- if(CMAKE_COMPILER_ID STREQUAL "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wlogical-op")
- endif()
- add_compile_definitions(QT_STRICT_ITERATORS)
-endif()
-
-include(CheckPIESupported)
-check_pie_supported(OUTPUT_VARIABLE PIE_MESSAGE LANGUAGES CXX)
-if(CMAKE_CXX_LINK_PIE_SUPPORTED)
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-endif()
-
include(GNUInstallDirs)
set(QWT_NAME_SUFFIX "" CACHE STRING "Qwt Name Suffix") It also removes unneeded compiler flags which enable warnings (In my opinion these flags might break something on new compilers in the future) and removes CMAKE_POSITION_INDEPENDENT_CODE as it is controlled by fPIC option of the package. What do you think? Could you include these changes in the PR? |
Specify library name and version: qwt/6.2.0
This PR allows qwt to build with Qt5 or Qt6, resolving issue #16326 and #10744