Skip to content

Commit 0b170b5

Browse files
Do not add imguizmo quat directory to Diligent-Imgui's public include directories
This avoids conflicts with other imguizmo
1 parent 5ac237e commit 0b170b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Imgui/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ cmake_minimum_required (VERSION 3.6)
22

33
project(Diligent-Imgui CXX)
44

5-
set(IMGUIZMO_QUAT_PATH ../ThirdParty/imGuIZMO.quat)
6-
75
set(SOURCE
86
src/ImGuiDiligentRenderer.cpp
97
src/ImGuiImplDiligent.cpp
@@ -106,7 +104,6 @@ set_common_target_properties(Diligent-Imgui)
106104
target_include_directories(Diligent-Imgui
107105
PUBLIC
108106
interface
109-
${IMGUIZMO_QUAT_PATH}
110107
PRIVATE
111108
include
112109
)

ThirdParty/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ if (NOT EXISTS "${DILIGENT_ARGS_DIR}/args.hxx")
6363
endif()
6464
install(FILES "${DILIGENT_ARGS_DIR}/LICENSE" DESTINATION ${LICENSE_INSTALL_PATH} RENAME args-license.txt)
6565

66+
if(NOT IMGUIZMO_QUAT_PATH)
67+
set(IMGUIZMO_QUAT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/imGuIZMO.quat CACHE PATH "imGuIZMO.quat source directory")
68+
endif()
6669

6770
install(FILES tinygltf/LICENSE DESTINATION ${LICENSE_INSTALL_PATH} RENAME tinygltf-license.txt)
6871
install(FILES imGuIZMO.quat/license.txt DESTINATION ${LICENSE_INSTALL_PATH} RENAME imGuIZMO.quat-license.txt)

0 commit comments

Comments
 (0)