From 9402f6f765f31ba71922b7659b36073a5096fc1b Mon Sep 17 00:00:00 2001 From: xaedes Date: Wed, 13 Jul 2022 22:47:22 +0200 Subject: [PATCH] [imgui] Set C++ 11 standard in CMakeLists.txt (#25601) * [imgui] Enable C++ 11 standard as code requires it see vcpkg issue microsoft#25588 * [imgui] Enable C++ 11 standard using target_compile_features As lerppana suggested: It is better to use cxx_std_11 meta feature instead of locking the version number. This should indicate cmake to use at least 11 instead of exactly 11. see vcpkg issue microsoft#25588 * [imgui] update versions (vcpkg x-add-version imgui) Enable C++ 11 standard as code requires it see vcpkg issue microsoft#25588 --- ports/imgui/CMakeLists.txt | 2 ++ ports/imgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 41f03db1cd..85544830c0 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -28,6 +28,8 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp ) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + if(IMGUI_BUILD_ALLEGRO5_BINDING) find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index c25d2ecf16..200fd5b06f 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.88", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 778be2f1f6..a7eb59c671 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2966,7 +2966,7 @@ }, "imgui": { "baseline": "1.88", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 172e3db7c3..e9ccb175b0 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a4c55df4b895535fba9e3934ed64cef92bf4a4d", + "version": "1.88", + "port-version": 1 + }, { "git-tree": "c28ebbdbe22a87ce01c3b2b6c15bed036721c6a0", "version": "1.88",