Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bartosz Golaszewski <brgl@bgdev.pl> |
| 3 | Date: Fri, 23 Nov 2018 11:44:56 +0100 |
| 4 | Subject: [PATCH] build: don't look for Iconv |
| 5 | |
| 6 | Drop the find_package() for Iconv. CMake is unable to find iconv.h in |
| 7 | native build but all modern systems supply it as part of the standard |
| 8 | C library. We don't need this check in meta-openembedded. |
| 9 | |
| 10 | Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 11 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 12 | |
Patrick Williams | b9af875 | 2023-01-30 13:28:01 -0600 | [diff] [blame^] | 13 | Upstream-Status: Inappropriate |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 14 | - upstream doxygen must build on many architectures, this change is |
| 15 | too intrusive for upstream |
| 16 | --- |
| 17 | CMakeLists.txt | 4 ---- |
| 18 | 1 file changed, 4 deletions(-) |
| 19 | |
| 20 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 21 | index 06b9696f..f30b46b8 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | --- a/CMakeLists.txt |
| 23 | +++ b/CMakeLists.txt |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 24 | @@ -117,10 +117,6 @@ if (sqlite3) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | endif() |
| 26 | endif() |
| 27 | |
| 28 | -find_package(Iconv REQUIRED) |
| 29 | -include_directories(${ICONV_INCLUDE_DIR}) |
| 30 | - |
| 31 | - |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 32 | #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 33 | set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) |
| 34 | set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) |
| 35 | -- |
Andrew Geissler | e34f896 | 2021-04-15 15:53:51 -0500 | [diff] [blame] | 36 | 2.27.0 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 37 | |