Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fix CMake imgui and wpigui on macOS (#2669)

Browse Source
This commit is contained in:
Prateek Machiraju
2020-08-29 23:40:50 -04:00
committed by GitHub
parent 416288061a
commit c2c4090902
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imgui/CMakeLists.txt
View File

@@ -58,6 +58,8 @@ if (MSVC)
target_sources(imgui PRIVATE ${imgui_srcdir}/examples/imgui_impl_directx11.cpp)
else()
if (APPLE)
target_compile_options(imgui PRIVATE -fobjc-arc)
set_target_properties(imgui PROPERTIES LINK_FLAGS "-framework Metal -framework QuartzCore")
target_sources(imgui PRIVATE ${imgui_srcdir}/examples/imgui_impl_metal.mm)
else()
#target_sources(imgui PRIVATE ${imgui_srcdir}/examples/imgui_impl_opengl3.cpp)
@@ -67,3 +69,4 @@ target_link_libraries(imgui PUBLIC gl3w glfw)
target_include_directories(imgui PUBLIC "$<BUILD_INTERFACE:${imgui_srcdir}>" "$<BUILD_INTERFACE:${implot_srcdir}>" "$<BUILD_INTERFACE:${imgui_srcdir}/examples>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/stb-src>")
set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON)
target_compile_features(imgui PUBLIC cxx_std_17)

3
wpigui/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set_target_properties(wpigui PROPERTIES DEBUG_POSTFIX "d")
set_property(TARGET wpigui PROPERTY FOLDER "libraries")
target_compile_features(wpigui PUBLIC cxx_std_17)
wpilib_target_warnings(wpigui)
target_link_libraries(wpigui imgui)
@@ -24,6 +23,8 @@ if (MSVC)
target_sources(wpigui PRIVATE ${wpigui_windows_src})
else()
if (APPLE)
target_compile_options(wpigui PRIVATE -fobjc-arc)
set_target_properties(wpigui PROPERTIES LINK_FLAGS "-framework Metal -framework QuartzCore")
target_sources(wpigui PRIVATE ${wpigui_mac_src})
else()
target_sources(wpigui PRIVATE ${wpigui_unix_src})