From 9ac7c450c77d4b0722e0080292f20e7680b4e351 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 3 Jan 2017 14:21:59 +0000 Subject: [PATCH] [Minor] Move hiredis inclusion to the proper place --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9135266d49..a1cbac0996 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -729,13 +729,6 @@ ENDIF () #Check for openssl (required for dkim) SET(HAVE_OPENSSL 1) -IF(ENABLE_HIREDIS MATCHES "ON") - ADD_SUBDIRECTORY(contrib/hiredis) - SET(WITH_HIREDIS 1) - INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis") -ENDIF(ENABLE_HIREDIS MATCHES "ON") - - # Google performance tools IF(ENABLE_GPERF_TOOLS MATCHES "ON") @@ -1190,6 +1183,11 @@ ENDIF(NOT DESTDIR) ################################ SUBDIRS SECTION ########################### +IF(ENABLE_HIREDIS MATCHES "ON") + ADD_SUBDIRECTORY(contrib/hiredis) + SET(WITH_HIREDIS 1) + INCLUDE_DIRECTORIES(BEFORE "${CMAKE_SOURCE_DIR}/contrib/hiredis") +ENDIF(ENABLE_HIREDIS MATCHES "ON") ADD_SUBDIRECTORY(contrib/lgpl) IF(GLIB_COMPAT) -- 2.47.3