File tree Expand file tree Collapse file tree 1 file changed +5
-11
lines changed
Expand file tree Collapse file tree 1 file changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -145,27 +145,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/FindHiredis.cmake)
145145message (STATUS "redis-plus-plus check hiredis features" )
146146if (hiredis_FOUND)
147147 set (HIREDIS_FEATURE_TEST_INCLUDE ${hiredis_INCLUDE_DIRS} )
148- set (HIREDIS_FEATURE_TEST_LIB ${REDIS_PLUS_PLUS_HIREDIS_LIBS} )
149148else ()
150149 set (HIREDIS_FEATURE_TEST_INCLUDE ${HIREDIS_HEADER} )
151- set (HIREDIS_FEATURE_TEST_LIB ${HIREDIS_LIB} )
152150endif ()
153151set (HIREDIS_FEATURE_TEST_HEADER "${HIREDIS_FEATURE_TEST_INCLUDE} /hiredis/hiredis.h" )
154152
155- include (CheckSymbolExists )
153+ file (READ " ${HIREDIS_FEATURE_TEST_HEADER} " HIREDIS_HEADER_CONTENT )
156154
157- # Add hiredis to CMAKE_REQUIRED_LIBRARIES
158- set (CMAKE_REQUIRED_LIBRARIES_BACK ${CMAKE_REQUIRED_LIBRARIES} )
159- set (CMAKE_REQUIRED_LIBRARIES ${HIREDIS_FEATURE_TEST_LIB} )
160-
161- CHECK_SYMBOL_EXISTS(redisEnableKeepAliveWithInterval ${HIREDIS_FEATURE_TEST_HEADER} REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval)
155+ string (FIND "${HIREDIS_HEADER_CONTENT} " redisEnableKeepAliveWithInterval redisEnableKeepAliveWithInterval_POS)
156+ if (${redisEnableKeepAliveWithInterval_POS} GREATER -1)
157+ set (REDIS_PLUS_PLUS_HAS_redisEnableKeepAliveWithInterval ON )
158+ endif ()
162159
163160set (REDIS_PLUS_PLUS_GENERATED_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR} /${REDIS_PLUS_PLUS_HEADER_DIR} )
164161configure_file (${CMAKE_CURRENT_SOURCE_DIR} /hiredis_features.h.in ${CMAKE_CURRENT_BINARY_DIR} /${REDIS_PLUS_PLUS_SOURCE_DIR} /hiredis_features.h)
165162
166- # Restore CMAKE_REQUIRED_LIBRARIES
167- set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACK} )
168-
169163# Build static library
170164option (REDIS_PLUS_PLUS_BUILD_STATIC "Build static library" ON )
171165message (STATUS "redis-plus-plus build static library: ${REDIS_PLUS_PLUS_BUILD_STATIC} " )
You can’t perform that action at this time.
0 commit comments