Merge 686ea3b4a5 into e07ae7d3b6
This commit is contained in:
commit
1475ba8a32
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,3 +7,5 @@
|
||||
/*.pc
|
||||
*.dSYM
|
||||
tags
|
||||
build
|
||||
|
||||
|
||||
@ -231,6 +231,8 @@ IF(NOT DISABLE_TESTS)
|
||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test.sh)
|
||||
ENDIF()
|
||||
|
||||
ADD_SUBDIRECTORY(adapters)
|
||||
|
||||
# Add examples
|
||||
IF(ENABLE_EXAMPLES)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
|
||||
19
adapters/CMakeLists.txt
Normal file
19
adapters/CMakeLists.txt
Normal file
@ -0,0 +1,19 @@
|
||||
find_package(Qt5Core)
|
||||
IF (Qt5Core_FOUND)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
ADD_LIBRARY(hiredis-qt-adapter SHARED qt.h)
|
||||
TARGET_COMPILE_DEFINITIONS(hiredis-qt-adapter PRIVATE ${Qt5Core_DEFINITIONS})
|
||||
TARGET_INCLUDE_DIRECTORIES(hiredis-qt-adapter PRIVATE ${Qt5Core_INCLUDES})
|
||||
TARGET_LINK_LIBRARIES(hiredis-qt-adapter hiredis ${Qt5Core_LIBRARIES})
|
||||
|
||||
ADD_LIBRARY(hiredis-qt-adapter_static STATIC qt.h)
|
||||
TARGET_COMPILE_DEFINITIONS(hiredis-qt-adapter_static PRIVATE ${Qt5Core_DEFINITIONS})
|
||||
TARGET_INCLUDE_DIRECTORIES(hiredis-qt-adapter_static PRIVATE ${Qt5Core_INCLUDES})
|
||||
TARGET_LINK_LIBRARIES(hiredis-qt-adapter_static hiredis ${Qt5Core_LIBRARIES})
|
||||
|
||||
INSTALL(TARGETS hiredis-qt-adapter hiredis-qt-adapter_static
|
||||
EXPORT hiredis-qt-adapter-targets
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
ENDIF()
|
||||
@ -54,6 +54,15 @@ IF (ENABLE_SSL)
|
||||
TARGET_LINK_LIBRARIES(example-ssl hiredis hiredis_ssl)
|
||||
ENDIF()
|
||||
|
||||
find_package(Qt5Core)
|
||||
IF (Qt5Core_FOUND)
|
||||
SET(CMAKE_AUTOMOC ON)
|
||||
ADD_EXECUTABLE(example-qt example-qt.cpp)
|
||||
TARGET_COMPILE_DEFINITIONS(example-qt PRIVATE ${Qt5Core_DEFINITIONS})
|
||||
TARGET_INCLUDE_DIRECTORIES(example-qt PRIVATE ${Qt5Core_INCLUDES})
|
||||
TARGET_LINK_LIBRARIES(example-qt hiredis hiredis-qt-adapter ${Qt5Core_LIBRARIES})
|
||||
ENDIF()
|
||||
|
||||
ADD_EXECUTABLE(example example.c)
|
||||
TARGET_LINK_LIBRARIES(example hiredis)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user