Skip to content

Commit c201b32

Browse files
authored
Merge pull request #1456 from MadLadSquad/auto
Update
2 parents 84bd6d7 + 4192c0e commit c201b32

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Framework/cmake/SetupCompilation.cmake

+11-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
3030
endif()
3131
set(GLFW_INCLUDE_DIRS "${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/glfw/include/")
3232
set(GLFW_LIBRARIES_T "glfw")
33+
3334
if (WIN32)
3435
set(OPENGL_LIBRARIES_T "opengl32")
3536
set(VULKAN_LIBRARIES_T "vulkan-1")
37+
38+
add_subdirectory("${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/vulkan-headers")
3639
elseif (APPLE)
3740
find_package(OpenGL REQUIRED)
3841
set(OPENGL_LIBRARIES_T ${OPENGL_LIBRARIES})
@@ -43,9 +46,10 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
4346
set(OPENGL_LIBRARIES_T "OpenGL")
4447
set(X11_LIBRARIES "X11")
4548
set(VULKAN_LIBRARIES_T "vulkan")
46-
else ()
49+
50+
add_subdirectory("${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/vulkan-headers")
4751
endif()
48-
add_subdirectory("${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/vulkan-headers")
52+
4953
if (NOT BUILD_VARIANT_STATIC)
5054
set(BUILD_SHARED_LIBS ON)
5155
endif()
@@ -67,12 +71,15 @@ if (BUILD_VARIANT_VENDOR OR WIN32)
6771
else()
6872
find_package(PkgConfig REQUIRED)
6973
find_package(OpenGL REQUIRED)
74+
7075
if (NOT EMSCRIPTEN)
7176
find_package(Freetype REQUIRED)
7277
endif()
78+
7379
if (NOT WIN32)
7480
find_package(X11 REQUIRED)
7581
endif()
82+
7683
# Re-enable when yaml-cpp 0.8 is released
7784
if (BUILD_VARIANT_STATIC)
7885
set(YamlCpp_STATIC ON)
@@ -83,12 +90,14 @@ else()
8390
set(YAML_CPP_LIBRARIES_T "${YamlCpp_LIBRARY}")
8491

8592
set(OPENGL_LIBRARIES_T "${OPENGL_gl_LIBRARY}" "${OPENGL_LIBRARIES}")
93+
8694
pkg_check_modules(GLFW REQUIRED glfw3)
8795
if (BUILD_VARIANT_STATIC)
8896
set(GLFW_LIBRARIES_T ${GLFW_STATIC_LIBRARIES})
8997
else()
9098
set(GLFW_LIBRARIES_T ${GLFW_LIBRARIES})
9199
endif()
100+
92101
pkg_check_modules(Vulkan REQUIRED vulkan)
93102
set(VULKAN_LIBRARIES_T ${Vulkan_LINK_LIBRARIES})
94103
endif()

0 commit comments

Comments
 (0)