diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-06 14:20:19 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-11-06 15:24:35 +0000 |
| commit | 38f1a10b6f6deeee0871535fe7430ebd90f3a935 (patch) | |
| tree | 8612cac4d02df5c2135ba3ac62f85acb2a00393c /src/corelib/configure.cmake | |
| parent | e11522726bc7f05947e447ae96b85bc1e2d4685c (diff) | |
CMake: Improve handling of the different kinds of iconv
Improve conditions/enable/disable conditions for iconv related features.
These are detected a bit different from what qmake does, so adapt to that.
Change-Id: I7b3e4baf05dc324507f370d7f651a62f29e42a98
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 5770882bc8..7436ced79b 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -386,7 +386,7 @@ qt_feature("iconv" PUBLIC PRIVATE SECTION "Internationalization" LABEL "iconv" PURPOSE "Provides internationalization on Unix." - CONDITION NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( QT_FEATURE_posix_libiconv OR TEST_sun_iconv OR QT_FEATURE_gnu_libiconv ) + CONDITION NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv ) ) qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1") qt_feature("posix_libiconv" PRIVATE @@ -395,11 +395,17 @@ qt_feature("posix_libiconv" PRIVATE ENABLE INPUT_iconv STREQUAL 'posix' DISABLE INPUT_iconv STREQUAL 'sun' OR INPUT_iconv STREQUAL 'gnu' OR INPUT_iconv STREQUAL 'no' ) +qt_feature("sun_libiconv" + LABEL "SUN iconv" + CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_sun_iconv + ENABLE TEST_sun_iconv + DISABLE NOT TEST_sun_iconv +) qt_feature("gnu_libiconv" PRIVATE LABEL "GNU iconv" - CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND NOT QT_FEATURE_posix_libiconv AND NOT TEST_sun_iconv AND libs.gnu_iconv OR FIXME - ENABLE INPUT_iconv STREQUAL 'gnu' - DISABLE INPUT_iconv STREQUAL 'posix' OR INPUT_iconv STREQUAL 'sun' OR INPUT_iconv STREQUAL 'no' + CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND NOT TEST_iconv_needlib + ENABLE TEST_posix_iconv AND NOT TEST_iconv_needlib + DISABLE NOT TEST_posix_iconv OR TEST_iconv_needlib ) qt_feature("icu" PRIVATE LABEL "ICU" |