Skip to content
This repository has been archived by the owner on Feb 25, 2025. It is now read-only.

Fix embedder glfw examples cmake subdirectory path error #48013

Merged
merged 4 commits into from
Nov 20, 2023
Merged

Fix embedder glfw examples cmake subdirectory path error #48013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6329ff
fix embedder glfw examples cmake subdirectory path error
hongeSunCoder Nov 14, 2023
26156b7
Merge branch 'main' into embedder_glfw_examples
hongeSunCoder Nov 14, 2023
8b53ac3
Merge branch 'main' into embedder_glfw_examples
hongeSunCoder Nov 15, 2023
f6d5bb7
Merge branch 'main' into embedder_glfw_examples
hongeSunCoder Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/glfw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ option(GLFW_BUILD_EXAMPLES "" OFF)
option(GLFW_BUILD_TESTS "" OFF)
option(GLFW_BUILD_DOCS "" OFF)
option(GLFW_INSTALL "" OFF)
add_subdirectory(${CMAKE_SOURCE_DIR}/../../../third_party/glfw glfw)
add_subdirectory(${CMAKE_SOURCE_DIR}/../../third_party/glfw glfw)
target_link_libraries(flutter_glfw glfw)
include_directories(${CMAKE_SOURCE_DIR}/../../../third_party/glfw/include)
include_directories(${CMAKE_SOURCE_DIR}/../../third_party/glfw/include)

############################################################
# Flutter Engine
Expand Down
4 changes: 2 additions & 2 deletions examples/glfw_drm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ option(GLFW_BUILD_DOCS "" OFF)
option(GLFW_INSTALL "" OFF)
find_package(OpenGL REQUIRED COMPONENTS EGL)
include_directories(${OPENGL_INCLUDE_DIRS})
add_subdirectory(${CMAKE_SOURCE_DIR}/../../../third_party/glfw glfw)
add_subdirectory(${CMAKE_SOURCE_DIR}/../../third_party/glfw glfw)
target_link_libraries(flutter_glfw glfw OpenGL::EGL)
include_directories(${CMAKE_SOURCE_DIR}/../../../third_party/glfw/include)
include_directories(${CMAKE_SOURCE_DIR}/../../third_party/glfw/include)

############################################################
# Flutter Engine
Expand Down
2 changes: 1 addition & 1 deletion examples/vulkan_glfw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ target_link_libraries(${EXE_NAME} PRIVATE Vulkan::Vulkan)

# Dependency: GLFW

set(GLFW_REPOSITORY ${CMAKE_SOURCE_DIR}/../../../third_party/glfw)
set(GLFW_REPOSITORY ${CMAKE_SOURCE_DIR}/../../third_party/glfw)

set(BUILD_SHARED_LIBS OFF)
set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
Expand Down