From 0bad5e79a2cb977c0b137ce73ef57a50ad0964bd Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 4 Oct 2019 13:10:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/filesystem/01_minimal/CMakeLists.txt | 2 +- examples/log/01_minimal/CMakeLists.txt | 2 +- examples/log/02_qt/CMakeLists.txt | 2 +- src/base/CMakeLists.txt | 2 +- src/filesystem/CMakeLists.txt | 2 +- src/log/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/filesystem/01_minimal/CMakeLists.txt b/examples/filesystem/01_minimal/CMakeLists.txt index 1e714bd..0a92a02 100644 --- a/examples/filesystem/01_minimal/CMakeLists.txt +++ b/examples/filesystem/01_minimal/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -target_link_libraries(${current_target} filesystem_static) +target_link_libraries(${current_target} myx-filesystem_static) target_link_libraries(${current_target} Qt5::Core) # Имя выходного файла для цели diff --git a/examples/log/01_minimal/CMakeLists.txt b/examples/log/01_minimal/CMakeLists.txt index 358f457..ec92ac0 100644 --- a/examples/log/01_minimal/CMakeLists.txt +++ b/examples/log/01_minimal/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(${current_target} PRIVATE ${CMAKE_SOURCE_DIR}/src) target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS}) target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS}) -target_link_libraries(${current_target} log_static) +target_link_libraries(${current_target} myx-log_static) # Имя выходного файла для цели set_target_properties(${current_target} diff --git a/examples/log/02_qt/CMakeLists.txt b/examples/log/02_qt/CMakeLists.txt index a2602ee..0e85ab7 100644 --- a/examples/log/02_qt/CMakeLists.txt +++ b/examples/log/02_qt/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(${current_target} SYSTEM PUBLIC ${SPDLOG_INCLUDE_DIRS target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS}) target_compile_options(${current_target} PUBLIC "${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -target_link_libraries(${current_target} log_static) +target_link_libraries(${current_target} myx-log_static) target_link_libraries(${current_target} Qt5::Core) # Имя выходного файла для цели diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index a36331c..842c8b9 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target base) +set(current_target ${PROJECT_NAME}-base) set(current_target_sources ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp diff --git a/src/filesystem/CMakeLists.txt b/src/filesystem/CMakeLists.txt index ffb527c..de01c75 100644 --- a/src/filesystem/CMakeLists.txt +++ b/src/filesystem/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target filesystem) +set(current_target ${PROJECT_NAME}-filesystem) # Список файлов исходных текстов set(current_target_sources diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt index 8d1e0c0..e64de41 100644 --- a/src/log/CMakeLists.txt +++ b/src/log/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target log) +set(current_target ${PROJECT_NAME}-log) # Список файлов исходных текстов set(current_target_sources