Add natvis file in cmake helpers.

Author: greg7mdp

CMakeLists.txt

@@ -181,54 +181,54 @@ if (GTL_BUILD_EXAMPLES)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
 
-    gtl_cc_app(ex_btree SRCS examples/btree/btree.cpp ${natvis})
+    gtl_cc_app(ex_btree SRCS examples/btree/btree.cpp)
 
-    gtl_cc_app(ex_insert_bench SRCS examples/phmap/insert_bench.cpp ${natvis})
-    gtl_cc_app(ex_mt_word_counter SRCS examples/phmap/mt_word_counter.cpp ${natvis})
-    gtl_cc_app(ex_p_bench SRCS examples/phmap/p_bench.cpp ${natvis})
+    gtl_cc_app(ex_insert_bench SRCS examples/phmap/insert_bench.cpp)
+    gtl_cc_app(ex_mt_word_counter SRCS examples/phmap/mt_word_counter.cpp)
+    gtl_cc_app(ex_p_bench SRCS examples/phmap/p_bench.cpp)
 
 if(MSVC)
-    gtl_cc_app(ex_lazy_emplace_l SRCS examples/phmap/lazy_emplace_l.cpp ${natvis})
+    gtl_cc_app(ex_lazy_emplace_l SRCS examples/phmap/lazy_emplace_l.cpp)
 endif()
 
-    gtl_cc_app(ex_allmaps SRCS examples/hmap/allmaps.cpp ${natvis})
-    gtl_cc_app(ex_basic SRCS examples/hmap/basic.cpp ${natvis})
-    gtl_cc_app(ex_bench SRCS examples/hmap/bench.cpp ${natvis} LIBS Threads::Threads)
-    gtl_cc_app(ex_emplace SRCS examples/hmap/emplace.cpp ${natvis})
+    gtl_cc_app(ex_allmaps SRCS examples/hmap/allmaps.cpp)
+    gtl_cc_app(ex_basic SRCS examples/hmap/basic.cpp)
+    gtl_cc_app(ex_bench SRCS examples/hmap/bench.cpp LIBS Threads::Threads)
+    gtl_cc_app(ex_emplace SRCS examples/hmap/emplace.cpp)
 
-    gtl_cc_app(ex_serialize SRCS examples/hmap/serialize.cpp ${natvis})
+    gtl_cc_app(ex_serialize SRCS examples/hmap/serialize.cpp)
     #target_include_directories(ex_serialize PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../cereal/include>)
 
-    gtl_cc_app(ex_hash SRCS examples/hmap/hash.cpp ${natvis})
-    gtl_cc_app(ex_hash_std SRCS examples/hmap/hash_std.cpp ${natvis})
-    gtl_cc_app(ex_hash_value SRCS examples/hmap/hash_value.cpp ${natvis})
-    gtl_cc_app(ex_two_files SRCS examples/hmap/f1.cpp examples/hmap/f2.cpp ${natvis})
-    gtl_cc_app(ex_knucleotide SRCS examples/hmap/knucleotide.cpp ${natvis} LIBS Threads::Threads)
-    gtl_cc_app(ex_dump_load SRCS examples/hmap/dump_load.cpp ${natvis})
-    gtl_cc_app(ex_dump_nested SRCS examples/hmap/dump_nested.cpp ${natvis})
-    gtl_cc_app(ex_matt SRCS examples/hmap/matt.cpp ${natvis})
-
-    gtl_cc_app(ex_soa SRCS examples/misc/soa.cpp ${natvis})
-    gtl_cc_app(ex_vec_utils SRCS examples/misc/vec_utils.cpp ${natvis})
-    gtl_cc_app(ex_bit_vector SRCS examples/misc/bit_vector.cpp ${natvis})
-    gtl_cc_app(ex_intrusive SRCS examples/misc/intrusive.cpp ${natvis})
-    gtl_cc_app(ex_utils SRCS "examples/misc/utils.cpp" ${natvis})
-    #gtl_cc_app(ex_adv_utils SRCS "examples/misc/adv_utils.cpp" ${natvis})
+    gtl_cc_app(ex_hash SRCS examples/hmap/hash.cpp)
+    gtl_cc_app(ex_hash_std SRCS examples/hmap/hash_std.cpp)
+    gtl_cc_app(ex_hash_value SRCS examples/hmap/hash_value.cpp)
+    gtl_cc_app(ex_two_files SRCS examples/hmap/f1.cpp examples/hmap/f2.cpp)
+    gtl_cc_app(ex_knucleotide SRCS examples/hmap/knucleotide.cpp LIBS Threads::Threads)
+    gtl_cc_app(ex_dump_load SRCS examples/hmap/dump_load.cpp)
+    gtl_cc_app(ex_dump_nested SRCS examples/hmap/dump_nested.cpp)
+    gtl_cc_app(ex_matt SRCS examples/hmap/matt.cpp)
+
+    gtl_cc_app(ex_soa SRCS examples/misc/soa.cpp)
+    gtl_cc_app(ex_vec_utils SRCS examples/misc/vec_utils.cpp)
+    gtl_cc_app(ex_bit_vector SRCS examples/misc/bit_vector.cpp)
+    gtl_cc_app(ex_intrusive SRCS examples/misc/intrusive.cpp)
+    gtl_cc_app(ex_utils SRCS "examples/misc/utils.cpp")
+    #gtl_cc_app(ex_adv_utils SRCS "examples/misc/adv_utils.cpp")
 
     ## cache/memoize
-    gtl_cc_app(ex_memoize_fib SRCS examples/memoize/memoize_fib.cpp ${natvis})
-    gtl_cc_app(ex_memoize_primes SRCS examples/memoize/memoize_primes.cpp ${natvis})
-    gtl_cc_app(ex_mt_memoize SRCS examples/memoize/mt_memoize.cpp ${natvis} LIBS Threads::Threads)
-    gtl_cc_app(ex_mt_memoize_lru SRCS examples/memoize/mt_memoize_lru.cpp ${natvis} LIBS Threads::Threads)
+    gtl_cc_app(ex_memoize_fib SRCS examples/memoize/memoize_fib.cpp)
+    gtl_cc_app(ex_memoize_primes SRCS examples/memoize/memoize_primes.cpp)
+    gtl_cc_app(ex_mt_memoize SRCS examples/memoize/mt_memoize.cpp LIBS Threads::Threads)
+    gtl_cc_app(ex_mt_memoize_lru SRCS examples/memoize/mt_memoize_lru.cpp LIBS Threads::Threads)
 
     find_package(Boost 1.70.0 QUIET)
     if (Boost_FOUND)
-       gtl_cc_app(ex_custom_pointer SRCS examples/hmap/custom_pointer.cpp ${natvis})
+       gtl_cc_app(ex_custom_pointer SRCS examples/hmap/custom_pointer.cpp)
        target_include_directories(ex_custom_pointer PRIVATE ${Boost_INCLUDE_DIRS})
     endif()
 endif()
 
 if (GTL_BUILD_BENCHMARKS)
-    gtl_cc_app(bench_bit_vector SRCS benchmarks/bitvector_bench.cpp ${natvis})
-    gtl_cc_app(bench_hash SRCS benchmarks/hash_bench.cpp ${natvis})
+    gtl_cc_app(bench_bit_vector SRCS benchmarks/bitvector_bench.cpp)
+    gtl_cc_app(bench_hash SRCS benchmarks/hash_bench.cpp)
 endif()

cmake/helpers.cmake

@@ -26,7 +26,7 @@ function(gtl_cc_app my_target)
     "SRCS;LIBS"
     ${ARGN}
   )
-  add_executable(${my_target} ${GTL_CC_APP_SRCS})
+  add_executable(${my_target} ${GTL_CC_APP_SRCS} ${natvis})
   target_link_libraries(${my_target} PRIVATE ${PROJECT_NAME} ${GTL_CC_APP_LIBS})
   gtl_set_target_options(${my_target})
 endfunction()
@@ -45,7 +45,7 @@ function(gtl_cc_test)
   )
 
   set(_NAME "test_${GTL_CC_TEST_NAME}")
-  add_executable(${_NAME} ${GTL_CC_TEST_SRCS})
+  add_executable(${_NAME} ${GTL_CC_TEST_SRCS} ${natvis})
   target_link_libraries(${_NAME} PRIVATE ${PROJECT_NAME} ${GTL_CC_TEST_DEPS})
   gtl_set_target_options(${_NAME})