From 7d906e08f8c03b9982ec4f5c9810691f696ba15f Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Sat, 15 Feb 2025 15:40:14 +0100 Subject: [PATCH] CMake hierarchy cleanup. --- aster/CMakeLists.txt | 35 +++---------------------- aster/include/CMakeLists.txt | 5 ++++ aster/include/aster/CMakeLists.txt | 11 ++++++++ aster/include/aster/core/CMakeLists.txt | 20 ++++++++++++++ aster/include/aster/util/CMakeLists.txt | 6 +++++ aster/src/CMakeLists.txt | 5 ++++ aster/src/aster/CMakeLists.txt | 6 +++++ aster/src/aster/core/CMakeLists.txt | 16 +++++++++++ aster/src/aster/util/CMakeLists.txt | 5 ++++ 9 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 aster/include/CMakeLists.txt create mode 100644 aster/include/aster/CMakeLists.txt create mode 100644 aster/include/aster/core/CMakeLists.txt create mode 100644 aster/include/aster/util/CMakeLists.txt create mode 100644 aster/src/CMakeLists.txt create mode 100644 aster/src/aster/CMakeLists.txt create mode 100644 aster/src/aster/core/CMakeLists.txt create mode 100644 aster/src/aster/util/CMakeLists.txt diff --git a/aster/CMakeLists.txt b/aster/CMakeLists.txt index ccd5fde..63762a6 100644 --- a/aster/CMakeLists.txt +++ b/aster/CMakeLists.txt @@ -10,42 +10,13 @@ find_package(fmt CONFIG REQUIRED) find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(EASTL CONFIG REQUIRED) -set(HEADER_FILES - "include/aster/core/global.h" - "include/aster/util/logger.h" - "include/aster/core/constants.h" - "include/aster/core/config.h" - "include/aster/core/context.h" - "include/aster/core/physical_device.h" - "include/aster/core/device.h" - "include/aster/core/swapchain.h" - "include/aster/core/pipeline.h" - "include/aster/core/queue_allocation.h" - "include/aster/core/buffer.h" - "include/aster/core/image.h" - "include/aster/core/surface.h" - "include/aster/core/size.h" - "include/aster/core/window.h" - "include/aster/aster.h") +add_library(aster_core STATIC) -set(SOURCE_FILES - "src/aster/core/global.cpp" - "src/aster/util/logger.cpp" - "src/aster/core/context.cpp" - "src/aster/core/physical_device.cpp" - "src/aster/core/device.cpp" - "src/aster/core/swapchain.cpp" - "src/aster/core/pipeline.cpp" - "src/aster/core/buffer.cpp" - "src/aster/core/image.cpp" - "src/aster/core/surface.cpp" - "src/aster/core/window.cpp") +add_subdirectory("include") +add_subdirectory("src") -add_library(aster_core STATIC ${SOURCE_FILES} ${HEADER_FILES}) set_property(TARGET aster_core PROPERTY CXX_STANDARD 20) -target_precompile_headers(aster_core PUBLIC "include/aster/aster.h") - target_include_directories(aster_core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include/aster") target_include_directories(aster_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") diff --git a/aster/include/CMakeLists.txt b/aster/include/CMakeLists.txt new file mode 100644 index 0000000..422709f --- /dev/null +++ b/aster/include/CMakeLists.txt @@ -0,0 +1,5 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +add_subdirectory("aster") diff --git a/aster/include/aster/CMakeLists.txt b/aster/include/aster/CMakeLists.txt new file mode 100644 index 0000000..eb3e272 --- /dev/null +++ b/aster/include/aster/CMakeLists.txt @@ -0,0 +1,11 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +add_subdirectory("core") +add_subdirectory("util") + +target_sources(aster_core + PUBLIC "aster.h") + +target_precompile_headers(aster_core PUBLIC "aster.h") \ No newline at end of file diff --git a/aster/include/aster/core/CMakeLists.txt b/aster/include/aster/core/CMakeLists.txt new file mode 100644 index 0000000..3c5500e --- /dev/null +++ b/aster/include/aster/core/CMakeLists.txt @@ -0,0 +1,20 @@ +# CMakeList.txt ; CMake project for Aster Core Headers + +cmake_minimum_required(VERSION 3.13) + +target_sources(aster_core +INTERFACE + "global.h" + "constants.h" + "config.h" + "context.h" + "physical_device.h" + "device.h" + "swapchain.h" + "pipeline.h" + "queue_allocation.h" + "buffer.h" + "image.h" + "surface.h" + "size.h" + "window.h") diff --git a/aster/include/aster/util/CMakeLists.txt b/aster/include/aster/util/CMakeLists.txt new file mode 100644 index 0000000..0d19944 --- /dev/null +++ b/aster/include/aster/util/CMakeLists.txt @@ -0,0 +1,6 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +target_sources(aster_core + INTERFACE "logger.h") diff --git a/aster/src/CMakeLists.txt b/aster/src/CMakeLists.txt new file mode 100644 index 0000000..9510d8b --- /dev/null +++ b/aster/src/CMakeLists.txt @@ -0,0 +1,5 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +add_subdirectory("aster") \ No newline at end of file diff --git a/aster/src/aster/CMakeLists.txt b/aster/src/aster/CMakeLists.txt new file mode 100644 index 0000000..8b7401e --- /dev/null +++ b/aster/src/aster/CMakeLists.txt @@ -0,0 +1,6 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +add_subdirectory("core") +add_subdirectory("util") \ No newline at end of file diff --git a/aster/src/aster/core/CMakeLists.txt b/aster/src/aster/core/CMakeLists.txt new file mode 100644 index 0000000..0710bdc --- /dev/null +++ b/aster/src/aster/core/CMakeLists.txt @@ -0,0 +1,16 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +target_sources(aster_core +PRIVATE + "global.cpp" + "context.cpp" + "physical_device.cpp" + "device.cpp" + "swapchain.cpp" + "pipeline.cpp" + "buffer.cpp" + "image.cpp" + "surface.cpp" + "window.cpp") diff --git a/aster/src/aster/util/CMakeLists.txt b/aster/src/aster/util/CMakeLists.txt new file mode 100644 index 0000000..642cdda --- /dev/null +++ b/aster/src/aster/util/CMakeLists.txt @@ -0,0 +1,5 @@ +# CMakeList.txt ; CMake project for Aster Util Headers + +cmake_minimum_required(VERSION 3.13) + +target_sources(aster_core PRIVATE "logger.cpp")