Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[imgui] Add feature internal to add imgui_internal.h #9125

Closed
wants to merge 2 commits into from
Closed

[imgui] Add feature internal to add imgui_internal.h #9125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4cd163
[imgui] Add feature internal to add imgui_internal.h
AlvinZhangH Nov 28, 2019
7a82442
[imgui] Fix OPTIONS of vcpkg_configure_cmake
AlvinZhangH Nov 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ports/imgui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ set(IMGUI_INCLUDES_PRIVATE
imgui_internal.h
)

set(IMGUI_INCLUDES_ALL
${IMGUI_INCLUDES_PUBLIC}
)

IF (ENABLE_INTERNAL)
set(IMGUI_INCLUDES_ALL
${IMGUI_INCLUDES_PUBLIC}
${IMGUI_INCLUDES_PRIVATE}
)
ENDIF (ENABLE_INTERNAL)

set(IMGUI_SOURCES
imgui.cpp
imgui_demo.cpp
Expand All @@ -38,7 +49,7 @@ install(EXPORT IMGUIExport FILE ${PROJECT_NAME}Config.cmake NAMESPACE ${PROJECT_

if(NOT IMGUI_SKIP_HEADERS)
install(
FILES ${IMGUI_INCLUDES_PUBLIC}
FILES ${IMGUI_INCLUDES_ALL}
DESTINATION include
)
endif()
5 changes: 4 additions & 1 deletion ports/imgui/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
Source: imgui
Version: 1.73-1
Version: 1.73-2
Homepage: https://github.com/ocornut/imgui
Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.

Feature: example
Description: build with examples
Build-Depends: glfw3, freeglut, opengl, sdl1

Feature: internal
Description: using the imgui_internal.h header
6 changes: 6 additions & 0 deletions ports/imgui/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ vcpkg_from_github(

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
internal ENABLE_INTERNAL
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DIMGUI_SKIP_HEADERS=ON
OPTIONS
${FEATURE_OPTIONS}
)

vcpkg_install_cmake()
Expand Down