diff --git a/cmake/cmlib b/cmake/cmlib index d28f78d..45d7f70 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit d28f78d52115566a8a2be22a77be44f928d8e621 +Subproject commit 45d7f7054d8228fddc296033e09d698a01d9e0b2 diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index 842c8b9..5aca9ab 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target ${PROJECT_NAME}-base) +set(current_target base) set(current_target_sources ${CMAKE_CURRENT_SOURCE_DIR}/config.cpp @@ -10,7 +10,8 @@ set(current_target_headers ${CMAKE_CURRENT_SOURCE_DIR}/config.hpp ) -add_common_library(TARGET ${current_target} SOURCES ${current_target_sources} ${current_target_headers}) +add_common_library(TARGET ${current_target} OUTPUT_NAME myx-${current_target} + SOURCES ${current_target_sources} ${current_target_headers}) common_target_properties(${current_target}) add_clang_tidy_check(${current_target} ${current_target_sources}) add_clang_analyze_check(${current_target} ${current_target_sources}) @@ -26,6 +27,12 @@ add_custom_target(${current_target}-install-headers -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) +set_target_properties(${current_target} + PROPERTIES + OUTPUT_NAME myx-base + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} + ) + # Правила для установки install(TARGETS ${current_target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(BUILD_SHARED_LIBS) diff --git a/src/filesystem/CMakeLists.txt b/src/filesystem/CMakeLists.txt index de01c75..23ec1dd 100644 --- a/src/filesystem/CMakeLists.txt +++ b/src/filesystem/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target ${PROJECT_NAME}-filesystem) +set(current_target filesystem) # Список файлов исходных текстов set(current_target_sources @@ -11,8 +11,9 @@ set(current_target_headers ${CMAKE_CURRENT_SOURCE_DIR}/paths.hpp ) -add_common_library(TARGET ${current_target} SOURCES ${current_target_sources} - ${CMAKE_SOURCE_DIR}/thirdparty/whereami/whereami.c) +add_common_library(TARGET ${current_target} OUTPUT_NAME myx-${current_target} + SOURCES ${current_target_sources} + ${CMAKE_SOURCE_DIR}/thirdparty/whereami/whereami.c) common_target_properties(${current_target}) add_clang_tidy_check(${current_target} ${current_target_sources}) add_clang_analyze_check(${current_target} ${current_target_sources}) @@ -32,6 +33,12 @@ add_custom_target(${current_target}-install-headers -DCMAKE_INSTALL_COMPONENT=headers -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" ) +set_target_properties(${current_target} + PROPERTIES + OUTPUT_NAME myx-filesystem + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} + ) + # Правила для установки install(TARGETS ${current_target}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(BUILD_SHARED_LIBS) diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt index e64de41..f3a5a5f 100644 --- a/src/log/CMakeLists.txt +++ b/src/log/CMakeLists.txt @@ -1,5 +1,5 @@ # Название основной цели и имя библиотеки в текущем каталоге -set(current_target ${PROJECT_NAME}-log) +set(current_target log) # Список файлов исходных текстов set(current_target_sources @@ -13,7 +13,8 @@ set(current_target_headers ${CMAKE_CURRENT_SOURCE_DIR}/spdlog_qt.hpp ) -add_common_library(TARGET ${current_target} SOURCES ${current_target_sources}) +add_common_library(TARGET ${current_target} OUTPUT_NAME myx-${current_target} + SOURCES ${current_target_sources}) common_target_properties(${current_target}) add_clang_tidy_check(${current_target} ${current_target_sources}) add_clang_analyze_check(${current_target} ${current_target_sources})