diff --git a/imgui/CMakeLists.txt b/imgui/CMakeLists.txt index aa15d2e15b..2b0b4a9115 100644 --- a/imgui/CMakeLists.txt +++ b/imgui/CMakeLists.txt @@ -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 "$" "$" "$" "$" "$") set_property(TARGET imgui PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_features(imgui PUBLIC cxx_std_17) diff --git a/wpigui/CMakeLists.txt b/wpigui/CMakeLists.txt index a5d1edcfcb..ff624be4f9 100644 --- a/wpigui/CMakeLists.txt +++ b/wpigui/CMakeLists.txt @@ -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})