| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From e32075119803f9fffbba01a31083e416cb213011 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Tue, 19 Dec 2017 16:37:20 +0100 |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 4 | Subject: [PATCH 1/7] CMakeLists.txt: Remove TRY_RUN for iconv |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | | CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately: |
| 10 | | _correct_iconv_EXITCODE (advanced) |
| 11 | |
| 12 | Upstream-Status: Inappropriate [OE specific] |
| 13 | |
| 14 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 15 | --- |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 16 | CMakeLists.txt | 6 ------ |
| 17 | 1 file changed, 6 deletions(-) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | |
| 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 20 | index f9d72db..ed99904 100644 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | --- a/CMakeLists.txt |
| 22 | +++ b/CMakeLists.txt |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 23 | @@ -526,15 +526,9 @@ endif(NOT HAVE_ICONV) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | |
| 25 | set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS}) |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 26 | file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator) |
| 27 | -CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\" |
| 28 | - #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv) |
| 29 | unset(_binary_dir_with_separator) |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 30 | unset(CMAKE_REQUIRED_LIBRARIES) |
| 31 | |
| 32 | -if(NOT _correct_iconv) |
| 33 | - message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv") |
| 34 | -endif(NOT _correct_iconv) |
| 35 | - |
| 36 | # ****************************** |
| 37 | # Backtraces for debugging |
| 38 | # ****************************** |
| 39 | -- |
| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 40 | 2.21.0 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 41 | |