Improve cmake more

Author: NBT22

.gitignore

@@ -1,3 +1,4 @@
 /.idea/
+/build/
 /cmake-build-*/
 /out/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.21)
 project(Luna C CXX)
 
 set(LUNA_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "The root directory of the project")
@@ -36,7 +36,7 @@ else ()
     set(RELEASE_FLAGS ${COMMON_FLAGS} ${RELEASE_FLAGS} -O3 -DNDEBUG)
 endif ()
 
-findVulkan()
+findDependencies()
 
 add_library(Luna STATIC
         src/luna/core/Buffer.cpp
@@ -85,9 +85,9 @@ add_library(Luna STATIC
         include/luna/lunaTypes.h
 )
 target_compile_options(Luna PRIVATE $<IF:$<CONFIG:Debug>,${DEBUG_FLAGS},${RELEASE_FLAGS}>)
-target_link_libraries(Luna PUBLIC LunaDependencies)
-    target_include_directories(Luna PUBLIC ${LUNA_SOURCE_DIR}/include)
-    target_include_directories(Luna PRIVATE ${LUNA_SOURCE_DIR}/src/headers)
+target_link_libraries(Luna PUBLIC _LunaInternalLibrary_Dependencies)
+target_include_directories(Luna PUBLIC ${LUNA_SOURCE_DIR}/include)
+target_include_directories(Luna PRIVATE ${LUNA_SOURCE_DIR}/src/headers)
 
 if (LUNA_EXAMPLES)
     add_subdirectory(example)

cmake/findPackages.cmake

@@ -2,27 +2,37 @@ include(FetchContent)
 include(CheckIncludeFile)
 include(${LUNA_SOURCE_DIR}/cmake/utils.cmake)
 
-function(findVulkan)
-    set(VOLK_PULL_IN_VULKAN OFF)
-    makePackageAvailable(https://github.com/zeux/volk.git vulkan-sdk-1.4.*.* Vulkan COMPONENTS volk)
-    set(VOLK_VERSION ${_LUNA_PACKAGE_LATEST_RELEASE_VERSION})
-    if (NOT Vulkan_volk_FOUND)
-        makePackageAvailable(https://github.com/KhronosGroup/Vulkan-Headers.git vulkan-sdk-1.4.*.* Headers)
-        ensureVersionsMatch("Volk" VOLK_VERSION "Vulkan Headers" _LUNA_PACKAGE_LATEST_RELEASE_VERSION)
-    else ()
-        add_library(volk::volk ALIAS Vulkan::volk)
-    endif ()
-
+function(findDependencies)
     disableOptions(SPIRV_REFLECT_EXECUTABLE SPIRV_REFLECT_INSTALL INSTALL_GTEST)
     set(SPIRV_REFLECT_STATIC_LIB ON)
     makePackageAvailable(https://github.com/KhronosGroup/SPIRV-Reflect.git vulkan-sdk-1.4.*.* SPIRV-Reflect)
-    ensureVersionsMatch("Volk" VOLK_VERSION "SPIRV-Reflect" _LUNA_PACKAGE_LATEST_RELEASE_VERSION)
+    set(SPIRV_REFLECT_VERSION ${_LUNA_PACKAGE_LATEST_RELEASE_VERSION})
 
     makePackageAvailable(https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git v3.*.* VulkanMemoryAllocator CONFIG)
 
-    add_library(LunaDependencies INTERFACE)
-    target_link_libraries(LunaDependencies INTERFACE volk::volk GPUOpen::VulkanMemoryAllocator spirv-reflect-static)
-    target_compile_options(LunaDependencies INTERFACE $<$<BOOL:${LUNA_DEFINE_VK_NO_PROTOTYPES}>:$<IF:$<OR:$<COMPILE_LANG_AND_ID:C,MSVC>,$<COMPILE_LANG_AND_ID:CXX,MSVC>>,/DVK_NO_PROTOTYPES,-DVK_NO_PROTOTYPES>>)
+    find_package(Vulkan COMPONENTS volk QUIET)
+    if (Vulkan_INCLUDE_DIRS STREQUAL "Vulkan_INCLUDE_DIR-NOTFOUND") # Unable to find Vulkan headers
+        makePackageAvailable(https://github.com/KhronosGroup/Vulkan-Headers.git vulkan-sdk-1.4.*.* Headers)
+        set(HEADERS_VERSION ${_LUNA_PACKAGE_LATEST_RELEASE_VERSION})
+        ensureVersionsMatch("SPIRV-Reflect" SPIRV_REFLECT_VERSION "Vulkan headers" HEADERS_VERSION)
+        set(Vulkan_INCLUDE_DIR ${VULKAN_HEADERS_SOURCE_DIR}/include)
+        find_package(Vulkan COMPONENTS volk QUIET) # This is kept to check if volk is installed on the system
+    endif ()
+    if (Vulkan_FOUND) # Able to find Volk
+        add_library(_LunaInternalLibrary_volk INTERFACE)
+        target_link_libraries(_LunaInternalLibrary_volk INTERFACE Vulkan::volk)
+        add_library(volk::volk_headers ALIAS _LunaInternalLibrary_volk)
+    else () # No Vulkan installation
+        set(VOLK_HEADERS_ONLY ON)
+        set(VULKAN_HEADERS_INSTALL_DIR ${Vulkan_INCLUDE_DIR}/../)
+        makePackageAvailable(https://github.com/zeux/volk.git vulkan-sdk-1.4.*.* volk)
+        set(VOLK_VERSION ${_LUNA_PACKAGE_LATEST_RELEASE_VERSION})
+        ensureVersionsMatch("Volk" VOLK_VERSION "SPIRV-Reflect" SPIRV_REFLECT_VERSION)
+    endif ()
+
+    add_library(_LunaInternalLibrary_Dependencies INTERFACE)
+    target_link_libraries(_LunaInternalLibrary_Dependencies INTERFACE volk::volk_headers spirv-reflect-static GPUOpen::VulkanMemoryAllocator)
+    target_compile_options(_LunaInternalLibrary_Dependencies INTERFACE $<$<BOOL:${LUNA_DEFINE_VK_NO_PROTOTYPES}>:$<IF:$<OR:$<COMPILE_LANG_AND_ID:C,MSVC>,$<COMPILE_LANG_AND_ID:CXX,MSVC>>,/DVK_NO_PROTOTYPES,-DVK_NO_PROTOTYPES>>)
 endfunction()
 
 function(findSDL3)

cmake/utils.cmake

@@ -13,7 +13,7 @@ macro(disableOptions)
 endmacro()
 
 macro(ensureVersionsMatch packageOne packageOneVersion packageTwo packageTwoVersion)
-    if (NOT ${packageOneVersion} STREQUAL ${packageTwoVersion})
+    if (NOT (${packageOneVersion} STREQUAL ${packageTwoVersion}))
         message(AUTHOR_WARNING "${packageOne} version ${${packageOneVersion}} does not match ${packageTwo} version ${${packageTwoVersion}}!")
     endif ()
 endmacro()

example/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.21)
 project(examples C)
 
 include(${LUNA_SOURCE_DIR}/cmake/options.cmake)