1From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sat, 5 Sep 2020 12:54:21 +0200
4Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler
5
6Define hiredis as a C project (and use a single PROJECT statement) to
7avoid the following build failure if a C++ compiler is not found:
8
9CMake Error at CMakeLists.txt:3 (PROJECT):
10  The CMAKE_CXX_COMPILER:
11
12    /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++
13
14  is not a full path to an existing compiler tool.
15
16  Tell CMake where to find the compiler by setting either the environment
17  variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
18  to the compiler, or to the compiler name if it is in the PATH.
19
20The only cpp source file is examples/example-qt.cpp which is never
21compiled with cmake buildsystem. This file is compiled only with the
22Makefile buildsystem so perhaps it should be removed. If it is added to
23the cmake buildsystem, a call to enable_language(CXX) will have to be
24added.
25
26Fixes:
27 - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850
28
29Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
30[Upstream status: https://github.com/redis/hiredis/pull/872]
31---
32 CMakeLists.txt | 3 +--
33 1 file changed, 1 insertion(+), 2 deletions(-)
34
35diff --git a/CMakeLists.txt b/CMakeLists.txt
36index 4cbd438..9d65b7f 100644
37--- a/CMakeLists.txt
38+++ b/CMakeLists.txt
39@@ -1,6 +1,5 @@
40 CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0)
41 INCLUDE(GNUInstallDirs)
42-PROJECT(hiredis)
43
44 OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF)
45 OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF)
46@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME)
47 SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}")
48 MESSAGE("Detected version: ${VERSION}")
49
50-PROJECT(hiredis VERSION "${VERSION}")
51+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}")
52
53 # Hiredis requires C99
54 SET(CMAKE_C_STANDARD 99)
55--
562.28.0
57
58