Skip to content

Commit 9cc7865

Browse files
committed
Maybe fixed everything?
1 parent 958842d commit 9cc7865

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

Framework/cmake/SetupCompilation.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ if (USE_CLI_PARSER_MODULE)
209209
endif()
210210
endif()
211211

212-
add_subdirectory("${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/utfcpp")
213-
214212
if (USE_I18N_MODULE)
215213
if (BUILD_VARIANT_VENDOR)
216214
set(USE_PRECONFIGURED_YAML ON)

Framework/cmake/SetupSources.cmake

+8-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(FRAMEWORK_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/Source/" "${UIMGUI_SRC_PREFIX}/F
77
"${UIMGUI_SRC_PREFIX}/Framework/Modules/CLIParser/ThirdParty/UntitledCLIParser/ThirdParty/"
88
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/vulkan-headers/include" "${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/"
99
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/source-libraries/cimgui/" ${YAML_CPP_INCLUDE_DIRS_T}
10+
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/utfcpp/" "${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/utfcpp/source/"
1011
${FREETYPE_INCLUDE_DIRS})
1112

1213
if (USE_KNOBS_MODULE)
@@ -58,25 +59,23 @@ endif()
5859

5960
file(GLOB_RECURSE UGUI_SRC "${UIMGUI_SRC_PREFIX}/Framework/Core/*.cpp"
6061
"${UIMGUI_SRC_PREFIX}/Framework/Renderer/*.cpp" ${IMGUI_SRC} ${GLAD_SRC}
61-
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/core/*.cpp"
62+
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/core/*.cpp" ${UIMGUI_CUSTOM_FRAMEWORK_SOURCES}
6263
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/misc/cpp/*.cpp" "${UIMGUI_SRC_PREFIX}/Framework/C/*.cpp"
63-
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/logger/*.cpp" ${UIMGUI_CUSTOM_FRAMEWORK_SOURCES}
64-
"${UIMGUI_SRC_PREFIX}/Framework/Modules/i18n/src/*.cpp"
64+
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/logger/*.cpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/Undo/src/*.cpp"
65+
"${UIMGUI_SRC_PREFIX}/Framework/Modules/i18n/src/*.cpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/OS/src/*.cpp"
6566
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/source-libraries/*.cpp"
66-
"${UIMGUI_SRC_PREFIX}/Framework/Modules/Modules.hpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/Undo/src/*.cpp"
67-
"${UIMGUI_SRC_PREFIX}/Framework/Modules/Manager/*.cpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/OS/src/*.cpp")
67+
"${UIMGUI_SRC_PREFIX}/Framework/Modules/Modules.hpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/Manager/*.cpp")
6868
file(GLOB_RECURSE UGUI_HEAD "${UIMGUI_SRC_PREFIX}/Framework/Core/*.hpp" "${UIMGUI_SRC_PREFIX}/Framework/Renderer/*.hpp"
69-
${IMGUI_HEAD} "${UIMGUI_SRC_PREFIX}/Framework/Renderer/*.h"
70-
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/core/*.h"
69+
${IMGUI_HEAD} "${UIMGUI_SRC_PREFIX}/Framework/Renderer/*.h" "${UIMGUI_SRC_PREFIX}/Framework/C/*.hpp"
70+
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/core/*.h" ${UIMGUI_CUSTOM_FRAMEWORK_HEADERS}
7171
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/core/*.hpp" "${UIMGUI_SRC_PREFIX}/Framework/C/*.h" ${GLAD_HEAD}
7272
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/imgui/misc/cpp/*.h"
7373
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/logger/*.h" "${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/logger/*.hpp"
74-
"${UIMGUI_SRC_PREFIX}/Framework/C/*.hpp" ${UIMGUI_CUSTOM_FRAMEWORK_HEADERS}
7574
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/source-libraries/*.h"
7675
"${UIMGUI_SRC_PREFIX}/Framework/Modules/OS/src/*.h" "${UIMGUI_SRC_PREFIX}/Framework/Modules/i18n/src/*.hpp"
7776
"${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/source-libraries/*.hpp"
7877
"${UIMGUI_SRC_PREFIX}/Framework/Modules/Undo/src/*.hpp" "${UIMGUI_SRC_PREFIX}/Framework/Modules/Manager/*.hpp"
79-
"${UIMGUI_SRC_PREFIX}/Framework/Modules/OS/src/*.hpp")
78+
"${UIMGUI_SRC_PREFIX}/Framework/Modules/OS/src/*.hpp" "${UIMGUI_SRC_PREFIX}/Framework/ThirdParty/utfcpp/*.h")
8079

8180
file(GLOB_RECURSE UGUI_APP_SRC "Source/*.cpp" "${UIMGUI_CUSTOM_APP_SOURCES}")
8281
file(GLOB_RECURSE UGUI_APP_HEAD "Source/*.hpp" "Generated/Config.hpp" "${UIMGUI_CUSTOM_APP_HEADERS}")

0 commit comments

Comments
 (0)