@@ -5,7 +5,7 @@ include(FetchContent)
55
66project (
77 simjson
8- VERSION 1.2.1
8+ VERSION 1.2.2
99 DESCRIPTION "Very simple json library"
1010 HOMEPAGE_URL "https://github.com/orefkov/simjson"
1111 LANGUAGES CXX
@@ -37,19 +37,14 @@ target_include_directories(
3737target_compile_features (simjson_simjson PUBLIC cxx_std_20 )
3838
3939# Для MSVC подключаем natvis файл для красивой отладки
40- if (${CMAKE_BUILD_TYPE} STREQUAL Debug)
41- if (NOT CMAKE_CXX_SIMULATE_ID)
42- set (CMAKE_CXX_SIMULATE_ID "None" )
43- endif ()
44- if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR ${CMAKE_CXX_SIMULATE_ID} STREQUAL MSVC )
45- add_custom_command (
46- TARGET simjson_simjson PRE_BUILD
47- COMMAND ${CMAKE_COMMAND} -E copy
48- ${CMAKE_CURRENT_SOURCE_DIR} /for_debug/simjson.natvis
49- ${CMAKE_CURRENT_BINARY_DIR} /simjson.natvis
50- )
51- target_link_options (simjson_simjson PUBLIC "/natvis:simjson.natvis" )
52- endif ()
40+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR "${CMAKE_CXX_SIMULATE_ID} " STREQUAL "MSVC " )
41+ add_custom_command (
42+ TARGET simjson_simjson PRE_BUILD
43+ COMMAND ${CMAKE_COMMAND} -E copy
44+ ${CMAKE_CURRENT_SOURCE_DIR} /for_debug/simjson.natvis
45+ ${CMAKE_BINARY_DIR} /simjson.natvis
46+ )
47+ target_link_options (simjson_simjson PUBLIC "/natvis:${CMAKE_BINARY_DIR} /simjson.natvis" )
5348endif ()
5449
5550set_target_properties (
@@ -72,7 +67,7 @@ function(add_simstr)
7267 simstr
7368 GIT_REPOSITORY https://github.com/orefkov/simstr.git
7469 GIT_SHALLOW TRUE
75- GIT_TAG 5b81228
70+ GIT_TAG tags/rel1.2.5
7671 FIND_PACKAGE_ARGS NAMES simstr
7772 )
7873 FetchContent_MakeAvailable (simstr)
0 commit comments