Fix macos build

3rdParty/msdf/CMakeLists.txt

@@ -14,7 +14,9 @@ if (ENABLE_MSDF)
     endif()
 
     unset(Freetype_FOUND)
-    find_package(Freetype QUIET)
+    if (NOT APPLE)
+        find_package(Freetype QUIET)
+    endif ()
     if (NOT Freetype_FOUND OR NOT EXISTS "${CMAKE_BINARY_DIR}/_deps/freetype-src/build")
         message("Installing freetype from sources")
         FetchContent_Declare(
@@ -51,8 +53,8 @@ if (ENABLE_MSDF)
         if (NOT ${build_result} EQUAL "0")
             message(FATAL_ERROR "Failed to build freetype!")
         endif()
-        set(FREETYPE_INCLUDE_DIR "${FT_SRC_DIR}/freetype-install/include/freetype2" CACHE INTERNAL "ft include dir")
+        set(FREETYPE_INCLUDE_DIR "${FT_SRC_DIR}/freetype-install/include/freetype2" CACHE INTERNAL "ft include dir" FORCE)
-        set(FREETYPE_BUILT_FROM_SOURCES ON CACHE BOOL "ft built from sources")
+        set(FREETYPE_BUILT_FROM_SOURCES ON CACHE BOOL "ft built from sources" FORCE)
         list(APPEND CMAKE_PREFIX_PATH "${FT_SRC_DIR}/freetype-install")
     endif()
 
@@ -87,7 +89,7 @@ endif()
 
 function(LinkMsdf TARGET)
     if (ENABLE_MSDF)
-        target_link_libraries(${TARGET} PRIVATE msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
+        target_link_libraries(${TARGET} PUBLIC msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
         if (FREETYPE_BUILT_FROM_SOURCES)
             target_include_directories(${TARGET} PUBLIC ${FREETYPE_INCLUDE_DIR})
         else()

cmake/functions/SetCompilerSettings.cmake

@@ -22,13 +22,4 @@ function(SetWarningSettings TARGET)
             set_target_properties(${TARGET} PROPERTIES LINK_FLAGS "/ignore:4099")
         endif()
     endif()
-endfunction()
-
-function(SetOutputDirs BASE_DIR)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BASE_DIR}" PARENT_SCOPE)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BASE_DIR}/release" PARENT_SCOPE)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${BASE_DIR}/minsizerel" PARENT_SCOPE)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${BASE_DIR}/relwithdebinfo" PARENT_SCOPE)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BASE_DIR}/debug" PARENT_SCOPE)
-    set(CMAKE_DEBUG_POSTFIX "d" PARENT_SCOPE)
 endfunction()

examples/CMakeLists.txt

@@ -34,8 +34,8 @@ if(APPLE)
     LinkAppleFrameworks(OpenVulkano_Examples)
 endif ()
 
-CopyResourcesToExe(openVulkanoCpp "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" ".ttf")
+CopyResourcesToExe(OpenVulkano_Examples "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" ".ttf")
-CopyResourcesToExe(openVulkanoCpp "${CMAKE_CURRENT_SOURCE_DIR}/ExampleSources" "*")
+CopyResourcesToExe(OpenVulkano_Examples "${CMAKE_CURRENT_SOURCE_DIR}/ExampleSources" "*")
 
 target_include_directories(OpenVulkano_Examples PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(OpenVulkano_Examples PRIVATE openVulkanoCpp)

openVulkanoCpp/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
 
-if(NOT IOS)
-    SetOutputDirs("${CMAKE_SOURCE_DIR}/bin")
-endif()
 
 set(BASH_EXECUTABLE "" CACHE FILEPATH "Path to bash executable")
 if ("${BASH_EXECUTABLE}" STREQUAL "")

tests/VersionTests.cpp

@@ -0,0 +1,11 @@
+#include <catch2/catch_all.hpp>
+
+#include "Base/Version.hpp"
+
+using namespace OpenVulkano;
+
+TEST_CASE("Version Test", "[Version]")
+{
+	Version v("v1.2.3");
+	CHECK(v == Version("1.2.3"));
+}