CONGE-1 Fixed some issues to make it cross compatible with clion, vscode and vs studio
This commit is contained in:
parent
af2d1c0683
commit
9766eb80cf
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ cmake_install.cmake
|
||||
CMakeCache.txt
|
||||
CMakeUserPresets.json
|
||||
.ninja*
|
||||
.vs/
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.29)
|
||||
cmake_minimum_required(VERSION 3.26)
|
||||
project(Demo1)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user