From 9d53047f94d17088446ea5ce878bd9ad3840d8ab Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Sat, 25 Nov 2023 22:31:33 +0100
Subject: [PATCH] Some bugfixes

---
 cmake/Filter.cmake                                      | 4 +++-
 cmake/SetCompilerSettings.cmake                         | 4 ++--
 cmake/SetupVulkan.cmake                                 | 6 +++---
 openVulkanoCpp/AR/ArSessionMetadata.cpp                 | 5 ++---
 openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cmake/Filter.cmake b/cmake/Filter.cmake
index 47289c6..dde772f 100644
--- a/cmake/Filter.cmake
+++ b/cmake/Filter.cmake
@@ -12,5 +12,7 @@ function(FilterPlatformPaths sourcesVar)
         list(FILTER ${sourcesVar} EXCLUDE REGEX ".*[\\/]Host[\\/]Windows[\\/].*")
     endif ()
 
-    list(FILTER sources EXCLUDE REGEX "main\.(m|mm|c|cpp)")
+    list(FILTER ${sourcesVar} EXCLUDE REGEX "main\.(m|mm|c|cpp)")
+
+    set(${sourcesVar} ${${sourcesVar}} PARENT_SCOPE)
 endfunction()
\ No newline at end of file
diff --git a/cmake/SetCompilerSettings.cmake b/cmake/SetCompilerSettings.cmake
index aa17352..5c2f0a6 100644
--- a/cmake/SetCompilerSettings.cmake
+++ b/cmake/SetCompilerSettings.cmake
@@ -14,10 +14,10 @@ endfunction()
 
 function(SetWarningSettings TARGET)
     if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunknown-pragmas" PARENT_SCOPE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas" PARENT_SCOPE)
     endif ()
     if (LINUX)
-        #target_compile_options(${TARGET} PRIVATE -Wall)
+        target_compile_options(${TARGET} PRIVATE -Wall)
     endif()
 endfunction()
 
diff --git a/cmake/SetupVulkan.cmake b/cmake/SetupVulkan.cmake
index b4a0276..fc8132c 100644
--- a/cmake/SetupVulkan.cmake
+++ b/cmake/SetupVulkan.cmake
@@ -13,9 +13,9 @@ function(SetupVulkan TARGET)
         endif()
     else ()
         find_package(Vulkan REQUIRED)
-        target_link_libraries(TARGET PRIVATE Vulkan::Vulkan)
+        target_link_libraries(${TARGET} PRIVATE Vulkan::Vulkan)
     endif ()
-    target_include_directories(TARGET PUBLIC ${Vulkan_INCLUDE_DIR})
+    target_include_directories(${TARGET} PUBLIC ${Vulkan_INCLUDE_DIR})
 
     if (ANDROID)
         add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
@@ -24,6 +24,6 @@ function(SetupVulkan TARGET)
     elseif (LINUX)
         add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
         find_package(XCB REQUIRED)
-        target_link_libraries(TARGET PRIVATE ${XCB_LIBRARIES})
+        target_link_libraries(${TARGET} PRIVATE ${XCB_LIBRARIES})
     endif()
 endfunction()
\ No newline at end of file
diff --git a/openVulkanoCpp/AR/ArSessionMetadata.cpp b/openVulkanoCpp/AR/ArSessionMetadata.cpp
index 3704666..10492a6 100644
--- a/openVulkanoCpp/AR/ArSessionMetadata.cpp
+++ b/openVulkanoCpp/AR/ArSessionMetadata.cpp
@@ -30,14 +30,13 @@ namespace OpenVulkano::AR
 
 	ArSessionMetadata ArSessionMetadata::FromYaml(const std::string& filePath)
 	{
-		//TODO
-		/*YAML::Node meta = YAML::LoadFile(filePath);
+		YAML::Node meta = YAML::LoadFile(filePath);
 
 		return {
 				ArType::GetFromName(meta["Type"].Scalar()),
 				ArDepthFormat::GetFromName(meta["DepthType"].Scalar()).value_or(ArDepthFormat::UNAVAILABLE),
 				Math::Range<uint8_t>(meta["MinConfidence"].as<uint8_t>(), meta["MaxConfidence"].as<uint8_t>())
-		};*/
+		};
 	}
 
 	ArSessionMetadata::ArSessionMetadata(const std::string& dirPath)
diff --git a/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp b/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp
index a9cbcc2..c650231 100644
--- a/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp
+++ b/openVulkanoCpp/Host/Linux/ResourceLoaderAppDirLinux.cpp
@@ -7,7 +7,7 @@
 #include "ResourceLoaderAppDirLinux.hpp"
 #include "Base/Utils.hpp"
 #include <unistd.h>
-#include <limits.h>
+#include <climits>
 #include <iostream>
 
 namespace OpenVulkano
@@ -19,7 +19,7 @@ namespace OpenVulkano
 		std::string FindAppDir()
 		{
 			char buffer[PATH_MAX];
-			size_t size;
+			ssize_t size;
 			if ((size = readlink("/proc/self/exe", buffer, sizeof(buffer))) != -1)
 			{
 				std::string_view appDirPath(buffer, size);