diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-04 16:01:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 16:01:31 +0200 |
| commit | 38b7ea72270fa80141692c7685e241bf079e4496 (patch) | |
| tree | 14f659e9bd94fee8de77efb93d435c40b863c4f0 | |
| parent | 273f35372c7960dbbcaf78ffcf02b36470e77b16 (diff) | |
| parent | cfe7560506e0f692feb947c2180c7df6e0ce628e (diff) | |
| download | vcpkg-38b7ea72270fa80141692c7685e241bf079e4496.tar.gz vcpkg-38b7ea72270fa80141692c7685e241bf079e4496.zip | |
Merge pull request #2506 from procxx/update_imgui
[imgui] Update to 1.53
| -rw-r--r-- | ports/imgui/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ports/imgui/CONTROL | 2 | ||||
| -rw-r--r-- | ports/imgui/portfile.cmake | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 3658c5cae..5bcf278f7 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -19,18 +19,23 @@ set(IMGUI_SOURCES imgui_draw.cpp ) -add_library(imgui +add_library(${PROJECT_NAME} ${IMGUI_INCLUDES_PUBLIC} ${IMGUI_INCLUDES_PRIVATE} ${IMGUI_SOURCES} ) -install(TARGETS imgui +target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>) + +install(TARGETS ${PROJECT_NAME} + EXPORT IMGUIExport RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install(EXPORT IMGUIExport FILE ${PROJECT_NAME}Config.cmake NAMESPACE ${PROJECT_NAME}:: DESTINATION share/${PROJECT_NAME}) + if(NOT IMGUI_SKIP_HEADERS) install( FILES ${IMGUI_INCLUDES_PUBLIC} diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 4428d0d45..6b6a82476 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,3 @@ Source: imgui -Version: 1.52 +Version: 1.53 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 385a2396b..1ca99841d 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.52 - SHA512 8ada897ae33bcffa222dab4e9ff602611fa27d43f26085b8f96c313fea917d3149f1e3f4640f6156cfb7bc39bcb116106ccb4e8da1409d467e78c93bf9f7ea03 + REF v1.53 + SHA512 3e1ebf3844eaca3471064fa3d5792525c696b39f502c75235fae469038b73ae0eff198f13d5e1a35f86c011903cd379066afe1e22b6df769b9b16dc390f8b0c3 HEAD_REF master ) @@ -19,6 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/imgui) file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/imgui) file(RENAME ${CURRENT_PACKAGES_DIR}/share/imgui/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/imgui/copyright) |