From 6905c9bb7629a6560fd8266efcf6440404f7aa2b Mon Sep 17 00:00:00 2001 From: Aleksandr Orefkov Date: Thu, 20 Nov 2025 14:13:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20natvis=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B5=20=D1=81=20?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=BC=20Visual=20Studio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 27 ++++++++++++--------------- readme.md | 2 +- readme_ru.md | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a538be9..6d7b775 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ include(FetchContent) project( simstr - VERSION 1.2.4 + VERSION 1.2.5 DESCRIPTION "Yet another string library" HOMEPAGE_URL "https://github.com/orefkov/simstr" LANGUAGES CXX @@ -48,20 +48,17 @@ if(EMSCRIPTEN) endif() endif(EMSCRIPTEN) -if (${CMAKE_BUILD_TYPE} STREQUAL Debug) - if (NOT CMAKE_CXX_SIMULATE_ID) - set (CMAKE_CXX_SIMULATE_ID "None") - endif() - # Для MSVC подключаем natvis файл для красивой отладки - if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR ${CMAKE_CXX_SIMULATE_ID} STREQUAL MSVC) - add_custom_command( - TARGET simstr_simstr PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/for_debug/simstr.natvis - ${CMAKE_CURRENT_BINARY_DIR}/simstr.natvis - ) - target_link_options(simstr_simstr PUBLIC "/natvis:simstr.natvis") - endif() +message("Configuring simstr for [${CMAKE_BUILD_TYPE}]") + +# Для MSVC подключаем natvis файл для красивой отладки +if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR "${CMAKE_CXX_SIMULATE_ID} " STREQUAL "MSVC ") + add_custom_command( + TARGET simstr_simstr PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/for_debug/simstr.natvis + ${CMAKE_BINARY_DIR}/simstr.natvis + ) + target_link_options(simstr_simstr PUBLIC "/natvis:${CMAKE_BINARY_DIR}/simstr.natvis") endif() set_target_properties( diff --git a/readme.md b/readme.md index ed47ad5..5cb2f43 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ # simstr - String object and function library [![CMake on multiple platforms](https://github.com/orefkov/simstr/actions/workflows/cmake-multi-platform.yml/badge.svg)](https://github.com/orefkov/simstr/actions/workflows/cmake-multi-platform.yml) -Version 1.2.4. +Version 1.2.5. On Russian | По-русски diff --git a/readme_ru.md b/readme_ru.md index 4ae9b2b..e191a40 100644 --- a/readme_ru.md +++ b/readme_ru.md @@ -1,7 +1,7 @@ # simstr - библиотека строковых объектов и функций [![CMake on multiple platforms](https://github.com/orefkov/simstr/actions/workflows/cmake-multi-platform.yml/badge.svg)](https://github.com/orefkov/simstr/actions/workflows/cmake-multi-platform.yml) -Версия 1.2.4. +Версия 1.2.5. On English | По-английски