Skip to content

Commit 1cbe1ba

Browse files
committed
Undo changes to cmakelists regarding wayland and x11
1 parent 8d09558 commit 1cbe1ba

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

.github/workflows/linux_uts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,3 @@ jobs:
3030
cd .debug
3131
ctest
3232
33-
# cmake .. -DCMAKE_BUILD_TYPE=Debug -DQUARTZ_COMPILE_UNIT_TESTS=True -DGLFW_BUILD_WAYLAND=OFF -DGLFW_BUILD_X11=ON

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,8 @@ set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
143143
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
144144
set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
145145
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
146-
# set(GLFW_BUILD_WAYLAND ON CACHE BOOL "" FORCE)
147-
# set(GLFW_BUILD_X11 OFF CACHE BOOL "" FORCE)
148-
set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "" FORCE)
149-
set(GLFW_BUILD_X11 ON CACHE BOOL "" FORCE)
146+
set(GLFW_BUILD_WAYLAND ON CACHE BOOL "" FORCE)
147+
set(GLFW_BUILD_X11 OFF CACHE BOOL "" FORCE)
150148
endif ()
151149
add_subdirectory("${VENDOR_ROOT_DIR}/glfw")
152150
# @todo: should these just be added to the glfw target?

0 commit comments

Comments
 (0)