Skip to content

Commit

Permalink
Merge pull request #7 from ko4life-net/imgui-v1.90.7
Browse files Browse the repository at this point in the history
Bump imgui to v1.90.7 and fix pdb installation step
  • Loading branch information
giladreich authored Jun 4, 2024
2 parents 1c50275 + b7d0123 commit 4118343
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include(CMakeOptions.cmake)
# PROJECT
##################################################################################################################

set(imgui_VERSION 1.88.0)
set(imgui_VERSION 1.90.7)

project(imgui
VERSION ${imgui_VERSION}
Expand All @@ -19,6 +19,8 @@ project(imgui
HOMEPAGE_URL "https://github.com/ocornut/imgui"
)

include(GNUInstallDirs)

set(CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL "" FORCE)

# Note that for multi-config generators, we don't need to set CMAKE_BUILD_TYPE.
Expand Down Expand Up @@ -186,13 +188,15 @@ install(FILES ${FONTS_FILES}
if(MSVC)
if(IMGUI_STATIC_LIBRARY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/$<TARGET_FILE_BASE_NAME:${PROJECT_NAME}>.pdb
DESTINATION lib
CONFIGURATIONS Debug OR RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT lib
OPTIONAL
)
else()
install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}>
DESTINATION bin
CONFIGURATIONS Debug OR RelWithDebInfo
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT bin
OPTIONAL
)
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CMake cross platform module for building [Dear ImGui](https://github.com/ocornut

Clone the project:
```bash
git clone --recursive https://github.com/giladreich/cmake-imgui
git clone --recursive --shallow-submodules https://github.com/giladreich/cmake-imgui
cd cmake-imgui
```

Expand Down
2 changes: 1 addition & 1 deletion imgui
Submodule imgui updated 183 files

0 comments on commit 4118343

Please sign in to comment.