Updated to CL 22661993:

* docs updates
* authoring fixes
* asset view in sample fix
* latest blast_tools_and_samples-windows.zip

4 files changed, 9 insertions, 15 deletions

diff --git a/test/compiler/cmake/windows/BlastPerfTests.cmake b/test/compiler/cmake/windows/BlastPerfTests.cmake
index fe1de27..0ef6083 100644
--- a/test/compiler/cmake/windows/BlastPerfTests.cmake
+++ b/test/compiler/cmake/windows/BlastPerfTests.cmake
@@ -8,7 +8,7 @@ SET(BLASTPERFTESTS_PLATFORM_COMMON_FILES
 )
 
 SET(BLASTPERFTESTS_PLATFORM_INCLUDES
-	PRIVATE ${NVTOOLSEXT_INCLUDE_DIRS}
+	PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
 )
 
 SET(BLASTPERFTESTS_COMPILE_DEFS
@@ -21,11 +21,8 @@ SET(BLASTPERFTESTS_COMPILE_DEFS
 	$<$<CONFIG:release>:${BLASTTESTS_SLN_RELEASE_COMPILE_DEFS}>
 )
 
-SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS
-	${NVTOOLSEXT_LIB} 
+SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS 
+    $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
 )
 
 
-SET(BLASTPERFTESTS_PLATFORM_LINKED_LIBS $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>)
-
-
diff --git a/test/compiler/cmake/windows/BlastUnitTests.cmake b/test/compiler/cmake/windows/BlastUnitTests.cmake
index 9397652..1d20411 100644
--- a/test/compiler/cmake/windows/BlastUnitTests.cmake
+++ b/test/compiler/cmake/windows/BlastUnitTests.cmake
@@ -8,7 +8,7 @@ SET(BLASTUNITTESTS_PLATFORM_COMMON_FILES
 )
 
 SET(BLASTUNITTESTS_PLATFORM_INCLUDES
-	PRIVATE ${NVTOOLSEXT_INCLUDE_DIRS}
+    PRIVATE $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_INCLUDE_DIRS}>
 )
 
 SET(BLASTUNITTESTS_COMPILE_DEFS
@@ -26,15 +26,12 @@ if(SERIALIZATION_INCLUDED)
 	MESSAGE("Serialization included")
 	SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
 		NvBlastExtSerialization
-		${NVTOOLSEXT_LIB} 
+        $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
 	)
 else()
 	MESSAGE("Serialization NOT NOT NOT included")
 	SET(BLASTUNITTESTS_PLATFORM_LINKED_LIBS
-		${NVTOOLSEXT_LIB} 
+        $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}>
 	)
 endif()
 
-
-#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES})
-#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP"	)
diff --git a/test/compiler/cmake/windows/CMakeLists.txt b/test/compiler/cmake/windows/CMakeLists.txt
index 635927b..0fcef3e 100644
--- a/test/compiler/cmake/windows/CMakeLists.txt
+++ b/test/compiler/cmake/windows/CMakeLists.txt
@@ -31,7 +31,7 @@ SET(BLASTTESTS_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTD
 SET(BLASTTESTS_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;)
 SET(BLASTTESTS_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;)
 SET(BLASTTESTS_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;)
-SET(BLASTTESTS_SLN_RELEASE_COMPILE_DEFS NDEBUG;NV_NVTX=1;)
+SET(BLASTTESTS_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
 
 IF(CMAKE_CL_64)
 	SET(LIBPATH_SUFFIX "x64")
diff --git a/test/src/unit/TkTests.cpp b/test/src/unit/TkTests.cpp
index 19f582a..3df536a 100644
--- a/test/src/unit/TkTests.cpp
+++ b/test/src/unit/TkTests.cpp
@@ -359,8 +359,8 @@ TEST_F(TkTestStrict, ActorDamageMultiGroup)
 	TkGroup* group1 = fwk->createGroup(gdesc);
 	EXPECT_TRUE(group1 != nullptr);
 
-	ExtGroupTaskManager& gtm1 = *ExtGroupTaskManager::create(*m_taskman, *group1);
-	ExtGroupTaskManager& gtm0 = *ExtGroupTaskManager::create(*m_taskman, *group0);
+	ExtGroupTaskManager& gtm1 = *ExtGroupTaskManager::create(*m_taskman, group1);
+	ExtGroupTaskManager& gtm0 = *ExtGroupTaskManager::create(*m_taskman, group0);
 
 	std::vector<TkFamily*> families(2);
 	std::map<TkFamily*, ExpectedVisibleChunks> expectedVisibleChunks;