Skip to content

Commit 9a082dc

Browse files
committed
Добавил подключение natvis файла и при сборке под clang-cl
1 parent 2ce7b66 commit 9a082dc

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ target_include_directories(
3737

3838
target_compile_features(simjson_simjson PUBLIC cxx_std_20)
3939

40+
if (NOT CMAKE_CXX_SIMULATE_ID)
41+
set (CMAKE_CXX_SIMULATE_ID "None")
42+
endif()
4043
# Для MSVC подключаем natvis файл для красивой отладки
41-
if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
44+
if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR ${CMAKE_CXX_SIMULATE_ID} STREQUAL MSVC)
4245
target_link_options(simjson_simjson PUBLIC "/natvis:${CMAKE_CURRENT_SOURCE_DIR}/for_debug/simjson.natvis")
4346
endif()
4447

@@ -62,7 +65,7 @@ function(add_simstr)
6265
simstr
6366
GIT_REPOSITORY https://github.com/orefkov/simstr.git
6467
GIT_SHALLOW TRUE
65-
GIT_TAG 1f225a7
68+
GIT_TAG 4ddb1ae
6669
FIND_PACKAGE_ARGS NAMES simstr
6770
)
6871
FetchContent_MakeAvailable(simstr)

0 commit comments

Comments
 (0)