| 1 | diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
|
| 2 | index dd851d7db21f..8f360a9ba780 100644
|
| 3 | |
| 4 | |
| 5 | @@ -57,7 +57,6 @@ endif()
|
| 6 |
|
| 7 | add_subdirectory(agg)
|
| 8 | add_subdirectory(bsdiff-courgette)
|
| 9 | -add_subdirectory(glaze)
|
| 10 | add_subdirectory(minizip)
|
| 11 | add_subdirectory(open-location-code)
|
| 12 | add_subdirectory(opening_hours)
|
| 13 | @@ -77,10 +76,13 @@ if (PLATFORM_DESKTOP)
|
| 14 | set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
|
| 15 | # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
|
| 16 | set(CMAKE_OBJC_FLAGS "")
|
| 17 | - add_subdirectory(glfw)
|
| 18 | - set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
|
| 19 | - set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
|
| 20 | - set(CMAKE_OBJC_FLAGS -fobjc-arc)
|
| 21 |
|
| 22 | - add_subdirectory(imgui)
|
| 23 | + if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
|
| 24 | + add_subdirectory(glfw)
|
| 25 | + set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
|
| 26 | + set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
|
| 27 | + set(CMAKE_OBJC_FLAGS -fobjc-arc)
|
| 28 | +
|
| 29 | + add_subdirectory(imgui)
|
| 30 | + endif()
|
| 31 | endif()
|
| 32 | diff --git a/libs/platform/platform_tests/CMakeLists.txt b/libs/platform/platform_tests/CMakeLists.txt
|
| 33 | index 2cea6978df79..454c2e55ba3d 100644
|
| 34 | |
| 35 | |
| 36 | @@ -7,7 +7,6 @@ set(SRC
|
| 37 | downloader_tests/downloader_test.cpp
|
| 38 | downloader_utils_tests.cpp
|
| 39 | get_text_by_id_tests.cpp
|
| 40 | - glaze_test.cpp
|
| 41 | jansson_test.cpp
|
| 42 | language_test.cpp
|
| 43 | local_country_file_tests.cpp
|
| 44 | @@ -25,5 +24,4 @@ target_link_libraries(${PROJECT_NAME}
|
| 45 | platform_tests_support
|
| 46 | platform
|
| 47 | cppjansson
|
| 48 | - glaze::glaze
|
| 49 | )
|
| 50 |
|