Fixing vcpkg hopefully

This commit is contained in:
Dynamitos
2025-01-23 15:26:32 +01:00
parent 35eb7544ee
commit dbe70d0ae7
13 changed files with 71 additions and 14 deletions
+3
View File
@@ -0,0 +1,3 @@
[submodule "external/vcpkg"]
path = external/vcpkg
url = https://github.com/microsoft/vcpkg.git
+8 -9
View File
@@ -1,10 +1,5 @@
cmake_minimum_required(VERSION 3.7...3.23)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
endif()
cmake_minimum_required(VERSION 3.28)
set(CMAKE_CXX_STANDARD 23)
# Handle superbuild first
option (USE_SUPERBUILD "Whether or not a superbuild should be invoked" ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
@@ -12,8 +7,7 @@ set(CMAKE_INSTALL_MESSAGE LAZY)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/external/vcpkg/scripts/buildsystems/vcpkg.cmake)
project(RayTracer)
@@ -29,8 +23,13 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/build)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/build)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_SOURCE_DIR}/build)
find_package(Assimp CONFIG REQUIRED)
find_package(glfw3 CONFIG REQUIRED)
find_package(glm CONFIG REQUIRED)
find_package(Ktx CONFIG REQUIRED)
add_executable(RayTracer "")
target_link_libraries(RayTracer PUBLIC glfw)
target_link_libraries(RayTracer PUBLIC glm::glm)
target_link_libraries(RayTracer PUBLIC KTX::ktx)
add_subdirectory(src/)
+5 -4
View File
@@ -1,15 +1,16 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Visual Studio 17 2022 Win64",
"name": "Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\build\\${name}",
"buildRoot": "${projectDir}\\bin\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": ""
"ctestCommandArgs": "",
"cmakeExecutable": "C:/Program Files/CMake/bin/cmake.exe"
}
]
}
Vendored Submodule
+1
Submodule external/vcpkg added at 01be99fec0
+3
View File
@@ -1,3 +1,6 @@
target_sources(RayTracer
PRIVATE
main.cpp)
add_subdirectory(scene/)
add_subdirectory(window/)
+6
View File
@@ -1,3 +1,9 @@
#include "window/Window.h"
int main() {
Window w(1920, 1080);
while (true) {
w.update();
}
return 0;
}
+4
View File
@@ -0,0 +1,4 @@
target_sources(RayTracer
PRIVATE
Scene.h
Scene.cpp)
+1
View File
@@ -0,0 +1 @@
#include "Scene.h"
+6
View File
@@ -0,0 +1,6 @@
#pragma once
class Scene
{
};
+4
View File
@@ -0,0 +1,4 @@
target_sources(RayTracer
PRIVATE
Window.h
Window.cpp)
+17
View File
@@ -0,0 +1,17 @@
#include "Window.h"
Window::Window(int width, int height)
{
glfwInit();
window = glfwCreateWindow(width, height, "RayTracer", nullptr, nullptr);
}
Window::~Window()
{
}
void Window::update()
{
glfwPollEvents();
glfwSwapBuffers(window);
}
+12
View File
@@ -0,0 +1,12 @@
#pragma once
#include <glfw/glfw3.h>
class Window
{
public:
Window(int width, int height);
~Window();
void update();
private:
GLFWwindow* window;
};
+1 -1
View File
@@ -1,3 +1,3 @@
{
"dependencies": ["assimp", "glfw3", "glm", "stb", "fmt"]
"dependencies": ["ktx", "glfw3", "glm", "stb", "fmt"]
}