Исправлены правила для сборки примеров
This commit is contained in:
parent
d06bc7644d
commit
2bf177affe
@ -58,7 +58,6 @@ if(MYXLIB_BUILD_EXAMPLES_HO)
|
||||
|
||||
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
||||
# target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
|
||||
|
||||
add_dependencies(${TRGT}-ho base-header-only filesystem-header-only)
|
||||
|
||||
|
@ -66,7 +66,6 @@ if(MYXLIB_BUILD_EXAMPLES_HO)
|
||||
|
||||
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
||||
# target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
|
||||
|
||||
add_dependencies(${TRGT}-ho base-header-only qt-header-only)
|
||||
|
||||
|
@ -58,14 +58,23 @@ if(MYXLIB_BUILD_EXAMPLES)
|
||||
endif()
|
||||
|
||||
if(MYXLIB_BUILD_EXAMPLES_HO)
|
||||
set(REDIS_LIB_DIR ${CMAKE_SOURCE_DIR}/src/myx/redis)
|
||||
|
||||
set(REDIS_moc_hpp
|
||||
${REDIS_LIB_DIR}/client.hpp
|
||||
${REDIS_LIB_DIR}/lexer.hpp
|
||||
${REDIS_LIB_DIR}/parser.hpp
|
||||
${REDIS_LIB_DIR}/request.hpp)
|
||||
|
||||
qt5_wrap_cpp(REDIS_moc_cpp ${REDIS_moc_hpp})
|
||||
|
||||
# Цель для создания исполняемого файла
|
||||
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_qrc})
|
||||
add_executable(${TRGT}-ho ${TRGT_cpp} ${TRGT_moc_cpp} ${REDIS_moc_cpp} ${TRGT_moc_hpp})
|
||||
common_target_properties(${TRGT}-ho)
|
||||
|
||||
target_include_directories(${TRGT}-ho PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
||||
target_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS})
|
||||
# target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY)
|
||||
|
||||
add_dependencies(${TRGT}-ho base-header-only redis-header-only)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user