refactor

CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(APP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/apps/LoopThroughWithOpenGLCompositing")
-set(GPUDIRECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/Blackmagic DeckLink SDK 16.0/Win/Samples/NVIDIA_GPUDirect")
+set(GPUDIRECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/Blackmagic DeckLink SDK 16.0/Win/Samples/NVIDIA_GPUDirect" CACHE PATH "Path to the NVIDIA_GPUDirect sample directory from the Blackmagic DeckLink SDK")
 
 if(NOT EXISTS "${APP_DIR}/LoopThroughWithOpenGLCompositing.cpp")
 	message(FATAL_ERROR "Imported app sources were not found under ${APP_DIR}")
@@ -35,8 +35,12 @@ set(APP_SOURCES
 	"${APP_DIR}/RuntimeHost.h"
 	"${APP_DIR}/RuntimeJson.cpp"
 	"${APP_DIR}/RuntimeJson.h"
+	"${APP_DIR}/RuntimeParameterUtils.cpp"
+	"${APP_DIR}/RuntimeParameterUtils.h"
 	"${APP_DIR}/ShaderCompiler.cpp"
 	"${APP_DIR}/ShaderCompiler.h"
+	"${APP_DIR}/ShaderPackageRegistry.cpp"
+	"${APP_DIR}/ShaderPackageRegistry.h"
 	"${APP_DIR}/ShaderTypes.h"
 	"${APP_DIR}/stdafx.cpp"
 	"${APP_DIR}/stdafx.h"
@@ -90,6 +94,38 @@ endif()
 enable_testing()
 add_test(NAME RuntimeJsonTests COMMAND RuntimeJsonTests)
 
+add_executable(RuntimeParameterUtilsTests
+	"${APP_DIR}/RuntimeJson.cpp"
+	"${APP_DIR}/RuntimeParameterUtils.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/tests/RuntimeParameterUtilsTests.cpp"
+)
+
+target_include_directories(RuntimeParameterUtilsTests PRIVATE
+	"${APP_DIR}"
+)
+
+if(MSVC)
+	target_compile_options(RuntimeParameterUtilsTests PRIVATE /W3)
+endif()
+
+add_test(NAME RuntimeParameterUtilsTests COMMAND RuntimeParameterUtilsTests)
+
+add_executable(ShaderPackageRegistryTests
+	"${APP_DIR}/RuntimeJson.cpp"
+	"${APP_DIR}/ShaderPackageRegistry.cpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/tests/ShaderPackageRegistryTests.cpp"
+)
+
+target_include_directories(ShaderPackageRegistryTests PRIVATE
+	"${APP_DIR}"
+)
+
+if(MSVC)
+	target_compile_options(ShaderPackageRegistryTests PRIVATE /W3)
+endif()
+
+add_test(NAME ShaderPackageRegistryTests COMMAND ShaderPackageRegistryTests)
+
 add_custom_command(TARGET LoopThroughWithOpenGLCompositing POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy_if_different
 		"${GPUDIRECT_DIR}/bin/x64/dvp.dll"