From d06bc7644df6daf4b27fee18cf3faf64617115e4 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 24 Apr 2020 12:09:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D1=82=D0=B8=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=81=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=BC=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/filesystem/01_minimal/CMakeLists.txt | 8 +++++--- examples/qt/01_translators/CMakeLists.txt | 5 ++++- examples/redis/01_client/CMakeLists.txt | 17 ++++++++++------- .../redis/01_client/{main.cpp => client.cpp} | 0 4 files changed, 19 insertions(+), 11 deletions(-) rename examples/redis/01_client/{main.cpp => client.cpp} (100%) diff --git a/examples/filesystem/01_minimal/CMakeLists.txt b/examples/filesystem/01_minimal/CMakeLists.txt index 65415ab..5b9501c 100644 --- a/examples/filesystem/01_minimal/CMakeLists.txt +++ b/examples/filesystem/01_minimal/CMakeLists.txt @@ -27,13 +27,14 @@ if(MYXLIB_BUILD_EXAMPLES) # Создание цели для автоматического форматирования кода add_format_sources(${TRGT} ${TRGT_cpp}) + # Qt5 target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) - target_compile_definitions(${TRGT} PUBLIC MYXLIB_BUILD_LIBRARIES) - add_dependencies(${TRGT} base_static filesystem_static) - target_link_libraries(${TRGT} myx-filesystem) + target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) + add_dependencies(${TRGT} base filesystem) + target_link_libraries(${TRGT} base_static filesystem_static) target_link_libraries(${TRGT} Qt5::Core) target_link_libraries(${TRGT} Threads::Threads) @@ -57,6 +58,7 @@ 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 9cea132..7014a85 100644 --- a/examples/qt/01_translators/CMakeLists.txt +++ b/examples/qt/01_translators/CMakeLists.txt @@ -38,11 +38,13 @@ if(MYXLIB_BUILD_EXAMPLES) target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) - target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) add_dependencies(${TRGT} base qt) + target_link_libraries(${TRGT} base_static qt_static) + target_link_libraries(${TRGT} Qt5::Core) + target_link_libraries(${TRGT} Threads::Threads) # Имя выходного файла для цели set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME qt-translators) @@ -64,6 +66,7 @@ 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 7d5b735..fdfc6df 100644 --- a/examples/redis/01_client/CMakeLists.txt +++ b/examples/redis/01_client/CMakeLists.txt @@ -2,7 +2,7 @@ set(TRGT example-redis-client) # Список файлов исходных текстов -set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp) +set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/client.cpp) set(TRGT_moc_hpp ${CMAKE_CURRENT_SOURCE_DIR}/client.hpp) @@ -37,11 +37,12 @@ if(MYXLIB_BUILD_EXAMPLES) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS}) - target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY) - add_dependencies(${TRGT} base_static redis_static) + target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) + add_dependencies(${TRGT} base redis) - target_link_libraries(${TRGT} myx-redis) + target_link_libraries(${TRGT} base_static redis_static) target_link_libraries(${TRGT} Qt5::Core Qt5::Network) + target_link_libraries(${TRGT} Threads::Threads) # Имя выходного файла для цели set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME redis-client) @@ -63,14 +64,16 @@ 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_include_directories(${TRGT}-ho SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS}) + # target_compile_definitions(${TRGT} PUBLIC MYXLIB_HEADER_ONLY) - add_dependencies(${TRGT}-ho base-header-only qt-header-only) + add_dependencies(${TRGT}-ho base-header-only redis-header-only) - target_link_libraries(${TRGT}-ho Qt5::Core) + target_link_libraries(${TRGT}-ho Qt5::Core Qt5::Network) target_link_libraries(${TRGT}-ho Threads::Threads) # Имя выходного файла для цели - set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME qt-translators-ho) + set_target_properties(${TRGT}-ho PROPERTIES OUTPUT_NAME redis-translators-ho) add_sanitizers(${TRGT}-ho) cotire(${TRGT}-ho) diff --git a/examples/redis/01_client/main.cpp b/examples/redis/01_client/client.cpp similarity index 100% rename from examples/redis/01_client/main.cpp rename to examples/redis/01_client/client.cpp