From 9766eb80cfc23c22231f34894722ea3c928a12ea Mon Sep 17 00:00:00 2001
From: Jimmy Tremblay-Bernier <jimmy.tremblay-bernier.1@ens.etsmtl.ca>
Date: Thu, 21 Nov 2024 16:13:11 -0500
Subject: [PATCH] CONGE-1 Fixed some issues to make it cross compatible with
 clion, vscode and vs studio

---
 .gitignore                   | 3 ++-
 CMakeLists.txt               | 6 +++---
 Configure.bat                | 6 ++++--
 ConjureEngine/CMakeLists.txt | 7 +++++--
 Demo1/CMakeLists.txt         | 2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5e139a..e946c61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ build.ninja
 cmake_install.cmake
 CMakeCache.txt
 CMakeUserPresets.json
-.ninja*
\ No newline at end of file
+.ninja*
+.vs/
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5464007..2507bb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.29)
+cmake_minimum_required(VERSION 3.26)
 project(ConjureEngineProject)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -18,9 +18,9 @@ endif()
 set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
 
 # Include the Conan-generated files
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators")
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/generators")
 
-include("${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
 
 
 # Set common output directories
diff --git a/Configure.bat b/Configure.bat
index 1106840..b35b3d4 100644
--- a/Configure.bat
+++ b/Configure.bat
@@ -1,8 +1,10 @@
 @REM Run Conan to install dependencies
 rmdir build /s /q
 
+mkdir build
+
 @REM DEBUG
-conan install . -c tools.cmake.cmaketoolchain:generator=Msbuild -s build_type=Debug --build=missing
+conan install . -s build_type=Debug --build=missing
 
 @REM RELEASE
-conan install . -c tools.cmake.cmaketoolchain:generator=Msbuild -s build_type=Release --build=missing
+conan install . -s build_type=Release --build=missing
diff --git a/ConjureEngine/CMakeLists.txt b/ConjureEngine/CMakeLists.txt
index b5b42f6..100cb66 100644
--- a/ConjureEngine/CMakeLists.txt
+++ b/ConjureEngine/CMakeLists.txt
@@ -1,8 +1,11 @@
-cmake_minimum_required(VERSION 3.29)
-project(ConjureEngine)
+cmake_minimum_required(VERSION 3.26)
+
 
 set(CMAKE_CXX_STANDARD 20)
 
+project(ConjureEngine)
+
+
 find_package(glm REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Vulkan REQUIRED)
diff --git a/Demo1/CMakeLists.txt b/Demo1/CMakeLists.txt
index a2c2abc..f1b17b4 100644
--- a/Demo1/CMakeLists.txt
+++ b/Demo1/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.29)
+cmake_minimum_required(VERSION 3.26)
 project(Demo1)
 
 set(CMAKE_CXX_STANDARD 20)