From 2bf177affe6795ed031aeac4e029016477172b10 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Apr 2020 12:19:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/filesystem/01_minimal/CMakeLists.txt | 1 - examples/qt/01_translators/CMakeLists.txt | 1 - examples/redis/01_client/CMakeLists.txt | 13 +++++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/filesystem/01_minimal/CMakeLists.txt b/examples/filesystem/01_minimal/CMakeLists.txt index 5b9501c..f4d533a 100644 --- a/examples/filesystem/01_minimal/CMakeLists.txt +++ b/examples/filesystem/01_minimal/CMakeLists.txt @@ -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) diff --git a/examples/qt/01_translators/CMakeLists.txt b/examples/qt/01_translators/CMakeLists.txt index 7014a85..59af417 100644 --- a/examples/qt/01_translators/CMakeLists.txt +++ b/examples/qt/01_translators/CMakeLists.txt @@ -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) diff --git a/examples/redis/01_client/CMakeLists.txt b/examples/redis/01_client/CMakeLists.txt index fdfc6df..ce03a3e 100644 --- a/examples/redis/01_client/CMakeLists.txt +++ b/examples/redis/01_client/CMakeLists.txt @@ -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)