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 /cmake/QtBaseConfigureTests.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 'cmake/QtBaseConfigureTests.cmake')
| -rw-r--r-- | cmake/QtBaseConfigureTests.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake index d7f9788fc5..b79a1e3839 100644 --- a/cmake/QtBaseConfigureTests.cmake +++ b/cmake/QtBaseConfigureTests.cmake @@ -131,7 +131,9 @@ function(run_config_tests) target_link_libraries(Iconv PUBLIC iconv) endif() - run_config_test_sun_iconv() + if(NOT TEST_posix_iconv) + run_config_test_sun_iconv() + endif() run_config_test_architecture() run_linker_version_script_support() endfunction() |