Adding the old 'phong' demo back into build; updating submodules to latest versions

Apps/Demos/phong/Phong.cpp

@@ -63,13 +63,14 @@ Phong::Phong(int argc, c::const_string args[], c::const_string env[])
 
 	try {
 		settings_file.read();
-		settings = settings_file.get<GameSettings>();
-	} catch (nlohmann::json::exception& except) {
+	} catch (std::exception& except) {
 		settings_file.set(kDefaultSettings);
 		settings_file.write();
 		settings = settings_file.get<GameSettings>();
 	}
 
+	settings = settings_file.get<GameSettings>();
+
 	this->video_renderer.init(settings.renderer_settings);
 
 	//** EventDispatcher ** /

Modules/EditorWidgets/JsonEditor.cpp

@@ -11,7 +11,7 @@
 #include "ui_JsonEditor.h"
 
 #include "IOCore/Exception.hpp"
-#include "QJsonModel.hpp"
+#include "QJsonModel/QJsonModel.hpp"
 
 #include <QFile>
 #include <QFileDialog>

Modules/elemental/CMakeLists.txt

@@ -21,11 +21,7 @@ target_link_libraries(elemental PUBLIC
 )
 
 package_library_headers(elemental
-	GLOB ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/sys
-	${CMAKE_CURRENT_SOURCE_DIR}/types
-	${CMAKE_CURRENT_SOURCE_DIR}/details
-	${CMAKE_CURRENT_SOURCE_DIR}/util
+	${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
 target_include_directories(elemental

Modules/third_party/IOCore

@@ -1 +1 @@
-Subproject commit f2d68bd22515e46afa0d5efa9b453dcd05dbca25
+Subproject commit c348806df1db88f510322eb2cc66a7f78d14feea

Modules/third_party/QJsonModel

@@ -1 +1 @@
-Subproject commit 7ab6dfeb2d9bd435d19081c3674f0389f1d4b060
+Subproject commit 1f55f21589713a91decd38b066baa0a824adf034

Tests/CMakeLists.txt

@@ -47,7 +47,10 @@ set_target_properties(test-runner PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Tests"
 )
 
-add_custom_target(test_bin)
+if(NOT TARGET test_bin)
+	add_custom_target(test_bin)
+endif()
+
 add_dependencies(test_bin
 	test-runner
 )
@@ -73,6 +76,6 @@ add_dependencies(ctest
 	copy_test_assets
 )
 
-#add_subdirectory(sdl)
+add_subdirectory(sdl)
 
 # vim: ts=2 sw=2 noet foldmethod=indent  :

Tests/sdl/CMakeLists.txt

@@ -11,15 +11,18 @@ PROPERTIES
 EXCLUDE_FROM_ALL 1)
 
 target_include_directories(SDL_test-runner
-	PRIVATE ${Elemental_ARTIFACT_DIR}/include/elemental
-	PRIVATE ${Elemental_CMAKE_SOURCE_DIR}/Tests
-	..
+	PRIVATE
+	${Elemental_CMAKE_SOURCE_DIR}/Tests
 )
 #target_compile_definitions(SDL_test-runner PRIVATE -DUNIT_TEST=1)
 
 target_link_libraries(SDL_test-runner
 PRIVATE
-	${Elemental_TEST_SUITE_LIBS}
+	elemental
+	IOCore
+	Catch2::Catch2WithMain
+	FakeIt::FakeIt-catch
+	Threads::Threads
 )
 
 # Set output directories for build targetsk