diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-20 15:05:44 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-20 15:05:44 -0800 |
| commit | ea6783f9ba878a58b43d8728fd816413f708eb04 (patch) | |
| tree | f417a1556211ad78b7020a96a48432fc4192789a | |
| parent | 06819e43e30b64769d1ef036d20f6038dab4da34 (diff) | |
| download | vcpkg-ea6783f9ba878a58b43d8728fd816413f708eb04.tar.gz vcpkg-ea6783f9ba878a58b43d8728fd816413f708eb04.zip | |
[imgui] Use vendored stb at request of author -- static linking is explicitly worked around. Update to 1.52.
| -rw-r--r-- | ports/imgui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/imgui/CONTROL | 3 | ||||
| -rw-r--r-- | ports/imgui/portfile.cmake | 13 |
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index a4c49a337..3658c5cae 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -4,8 +4,6 @@ project(imgui CXX) set(CMAKE_DEBUG_POSTFIX d) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -find_path(STB_INCLUDE_DIR stb_rect_pack.h stb_textedit.h stb_truetype.h) - set(IMGUI_INCLUDES_PUBLIC imgui.h imconfig.h @@ -27,8 +25,6 @@ add_library(imgui ${IMGUI_SOURCES} ) -target_include_directories(imgui PUBLIC ${STB_INCLUDE_DIR}) - install(TARGETS imgui RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 35e041de1..4428d0d45 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,4 +1,3 @@ Source: imgui -Version: 1.51-1 -Build-Depends: stb +Version: 1.52 Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 587a4cf19..385a2396b 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -1,23 +1,14 @@ include(vcpkg_common_functions) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.51 - SHA512 33aea46d0ab8419fcd4af765c9f1a88dfb1b80ad466276b655a67f40ffedabe399db6b0d76a2ece74e551928bd6f842ae3fa42998e0b1a2206157a3852e002d6 + REF v1.52 + SHA512 8ada897ae33bcffa222dab4e9ff602611fa27d43f26085b8f96c313fea917d3149f1e3f4640f6156cfb7bc39bcb116106ccb4e8da1409d467e78c93bf9f7ea03 HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(GLOB STB_HEADERS ${SOURCE_PATH}/stb_*.h) -if(STB_HEADERS) - file(REMOVE ${STB_HEADERS}) -endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |