Skip to content

Commit 0182b74

Browse files
committed
fix: Build imgui with custom RV_DEPS_BASE_DIR
With the current build system if you specify a custom RV_DEPS_BASE_DIR it failed to build imgui correctly. This patch resolves this by using the standard arguments as found in `rv_create_std_deps_vars.cmake`.
1 parent f2ae7a7 commit 0182b74

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

cmake/dependencies/imgui.cmake

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ EXTERNALPROJECT_ADD(
5050
GIT_TAG ${RV_DEPS_IMPLOT_TAG}
5151
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
5252
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
53-
SOURCE_DIR ${CMAKE_BINARY_DIR}/${_target}/deps/implot
53+
SOURCE_DIR ${_base_dir}/deps/implot
5454
CONFIGURE_COMMAND ""
5555
BUILD_COMMAND ""
5656
INSTALL_COMMAND ""
@@ -71,7 +71,7 @@ EXTERNALPROJECT_ADD(
7171
GIT_TAG ${RV_DEPS_IMGUI_BACKEND_QT_TAG}
7272
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
7373
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
74-
SOURCE_DIR ${CMAKE_BINARY_DIR}/${_target}/deps/imgui-backend-qt
74+
SOURCE_DIR ${_base_dir}/deps/imgui-backend-qt
7575
CONFIGURE_COMMAND ""
7676
BUILD_COMMAND ""
7777
INSTALL_COMMAND ""
@@ -87,7 +87,7 @@ EXTERNALPROJECT_ADD(
8787
GIT_TAG ${RV_DEPS_IMGUI_NODE_EDITOR_TAG}
8888
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
8989
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
90-
SOURCE_DIR ${CMAKE_BINARY_DIR}/${_target}/deps/imgui-node-editor
90+
SOURCE_DIR ${_base_dir}/deps/imgui-node-editor
9191
CONFIGURE_COMMAND ""
9292
BUILD_COMMAND ""
9393
INSTALL_COMMAND ""
@@ -120,12 +120,11 @@ EXTERNALPROJECT_ADD(
120120
DOWNLOAD_NAME ${_target}_${_version}.zip
121121
DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
122122
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
123-
SOURCE_DIR ${CMAKE_BINARY_DIR}/${_target}/src
123+
SOURCE_DIR ${_base_dir}/src
124124
PATCH_COMMAND
125-
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/imgui/CMakeLists.txt ${CMAKE_BINARY_DIR}/${_target}/src/CMakeLists.txt && ${CMAKE_COMMAND} -E
126-
copy_directory ${CMAKE_BINARY_DIR}/${_target}/deps/implot ${CMAKE_BINARY_DIR}/${_target}/src/implot && ${CMAKE_COMMAND} -E copy_directory
127-
${CMAKE_BINARY_DIR}/${_target}/deps/imgui-backend-qt/backends ${CMAKE_BINARY_DIR}/${_target}/src/backends && ${CMAKE_COMMAND} -E copy_directory
128-
${CMAKE_BINARY_DIR}/${_target}/deps/imgui-node-editor ${CMAKE_BINARY_DIR}/${_target}/src/imgui-node-editor && ${_patch_command_for_imgui_backend_qt} &&
125+
${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/imgui/CMakeLists.txt ${_base_dir}/src/CMakeLists.txt && ${CMAKE_COMMAND} -E copy_directory
126+
${_base_dir}/deps/implot ${_base_dir}/src/implot && ${CMAKE_COMMAND} -E copy_directory ${_base_dir}/deps/imgui-backend-qt/backends ${_base_dir}/src/backends
127+
&& ${CMAKE_COMMAND} -E copy_directory ${_base_dir}/deps/imgui-node-editor ${_base_dir}/src/imgui-node-editor && ${_patch_command_for_imgui_backend_qt} &&
129128
${_patch_command_for_imgui}
130129
CONFIGURE_COMMAND ${CMAKE_COMMAND} ${_configure_options} -DFIND_QT_VERSION=${_find_qt_version} -DCMAKE_PREFIX_PATH=${_qt_location}/lib/cmake
131130
BUILD_COMMAND ${_cmake_build_command}

0 commit comments

Comments
 (0)