From 7a3023ab8b16bf99bb7b18eaa9263fe1293f6a20 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 14 Apr 2020 22:57:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20cotire=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/doc | 2 +- src/myx/base/CMakeLists.txt | 2 ++ src/myx/filesystem/CMakeLists.txt | 2 ++ src/myx/math/CMakeLists.txt | 2 ++ src/myx/qt/CMakeLists.txt | 2 ++ src/myx/redis/CMakeLists.txt | 8 ++++++-- 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cmake/cmlib b/cmake/cmlib index 3e8511d..0b69005 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 3e8511da714b7963cd7197dea83aad306d7c9f7b +Subproject commit 0b69005b7a05760d538c0902e634848b62f3cda1 diff --git a/cmake/doc b/cmake/doc index 81fe901..acdfb6a 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit 81fe90131c2d93d5d3e0f3b48c38fad0418fb953 +Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 diff --git a/src/myx/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt index a92660e..23f255f 100644 --- a/src/myx/base/CMakeLists.txt +++ b/src/myx/base/CMakeLists.txt @@ -33,6 +33,8 @@ add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) +cotire(${TRGT}) + # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt index 32af793..17e9c1d 100644 --- a/src/myx/filesystem/CMakeLists.txt +++ b/src/myx/filesystem/CMakeLists.txt @@ -37,6 +37,8 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) +cotire(${TRGT}) + # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/math/CMakeLists.txt b/src/myx/math/CMakeLists.txt index 69c87cd..199e71d 100644 --- a/src/myx/math/CMakeLists.txt +++ b/src/myx/math/CMakeLists.txt @@ -46,6 +46,8 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) +cotire(${TRGT}) + # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt index 79f8222..5e4079c 100644 --- a/src/myx/qt/CMakeLists.txt +++ b/src/myx/qt/CMakeLists.txt @@ -33,6 +33,8 @@ add_format_sources(${TRGT} ${TRGT_sources} ${TRGT_headers}) target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) +cotire(${TRGT}) + # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") diff --git a/src/myx/redis/CMakeLists.txt b/src/myx/redis/CMakeLists.txt index 2d9ac5c..23617b2 100644 --- a/src/myx/redis/CMakeLists.txt +++ b/src/myx/redis/CMakeLists.txt @@ -4,8 +4,10 @@ set(TRGT redis) # cmake-format: off # Список файлов исходных текстов set(TRGT_sources - ${CMAKE_CURRENT_SOURCE_DIR}/client.cpp ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/lexer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/parser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/client.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/lexer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/parser.cpp ${CMAKE_CURRENT_SOURCE_DIR}/request.cpp) # Список заголовочных файлов (используется для установки) @@ -41,6 +43,8 @@ target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Network_INCLUDE_DIRS}) target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${TRGT} PRIVATE ${CMAKE_BINARY_DIR}/include) +cotire(${TRGT}) + # Цель, используемая только для установки заголовочных файлов без компиляции проекта add_custom_target(${TRGT}-install-headers COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_COMPONENT=DEV -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")