Skip to content

Commit f200097

Browse files
committed
Make ezvcpkg a submodule
1 parent 1e6a844 commit f200097

File tree

8 files changed

+559
-216
lines changed

8 files changed

+559
-216
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
2-
cmake_policy(VERSION 3.6)
1+
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
2+
33
include("cmake/defaults.cmake")
44
set(NAME VulkanCppExamples)
55

6-
include("cmake/ezvcpkg.cmake")
6+
include(${CMAKE_SOURCE_DIR}/cmake/ezvcpkg/ezvcpkg.cmake)
77

88
ezvcpkg_fetch(
99
PACKAGES assimp basisu imgui glad glfw3 gli glm vulkan

cmake/compiler.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
22

33
if (WIN32)
4+
add_definitions(-DNOMINMAX)
5+
add_definitions(-D_USE_MATH_DEFINES)
46
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
7+
58
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
69
if (MSVC_VERSION GREATER_EQUAL 1910) # VS 2017
710
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp")
@@ -14,5 +17,6 @@ if (WIN32)
1417
add_compile_options("/std:c++latest")
1518
endif()
1619
endif()
20+
1721
endif()
1822

cmake/defaults.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ endforeach()
1919

2020
set(EXTERNAL_PROJECT_PREFIX "project")
2121
set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX})
22-
setup_externals_binary_dir()
2322

2423
set(CMAKE_CXX_STANDARD 14)
2524

26-
add_definitions(-DNOMINMAX)
27-
add_definitions(-D_USE_MATH_DEFINES)
2825
add_definitions(-DGLM_FORCE_RADIANS)
2926
add_definitions(-DGLM_FORCE_DEPTH_ZERO_TO_ONE)

cmake/ezvcpkg.cmake

Lines changed: 0 additions & 178 deletions
This file was deleted.

0 commit comments

Comments
 (0)