[cmake] refactor CMAKE_INSTALL_PREFIX into BUILD_DEP_TARGET macro

set CMAKE_INSTALL_PREFIX in BUILD_DEP_TARGET, and use DEPENDS_PATH for location

8 files changed, 20 insertions, 17 deletions

diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
index 57f84d5f8e..adf8d57c60 100644
--- a/cmake/modules/FindCrossGUID.cmake
+++ b/cmake/modules/FindCrossGUID.cmake
@@ -41,8 +41,7 @@ if(ENABLE_INTERNAL_CROSSGUID)
 
   # Force release build type. crossguid forces a debug postfix -dgb. may want to patch this
   # if we enable adaptive build type for the library.
-  set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCROSSGUID_TESTS=OFF
+  set(CMAKE_ARGS -DCROSSGUID_TESTS=OFF
                  -DDISABLE_WALL=ON
                  -DCMAKE_BUILD_TYPE=Release)
 
diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
index 71db000573..4b03986923 100644
--- a/cmake/modules/FindFlatBuffers.cmake
+++ b/cmake/modules/FindFlatBuffers.cmake
@@ -19,8 +19,7 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
   set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/bin/flatc CACHE INTERNAL "FlatBuffer compiler")
   set(FLATBUFFERS_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include CACHE INTERNAL "FlatBuffer include dir")
 
-  set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCMAKE_BUILD_TYPE=Release
+  set(CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release
                  -DFLATBUFFERS_CODE_COVERAGE=OFF
                  -DFLATBUFFERS_BUILD_TESTS=OFF
                  -DFLATBUFFERS_INSTALL=ON
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 574374393a..096f927ad6 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -35,8 +35,7 @@ if(ENABLE_INTERNAL_FMT)
     set(PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -i ${patch})
   endif()
 
-  set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+  set(CMAKE_ARGS -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
                  -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                  -DFMT_DOC=OFF
                  -DFMT_TEST=OFF
diff --git a/cmake/modules/FindLibAndroidJNI.cmake b/cmake/modules/FindLibAndroidJNI.cmake
index a779d9d6e9..d100f9c721 100644
--- a/cmake/modules/FindLibAndroidJNI.cmake
+++ b/cmake/modules/FindLibAndroidJNI.cmake
@@ -18,8 +18,7 @@ set(MODULE_LC libandroidjni)
 
 SETUP_BUILD_VARS()
 
-set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-               -DCMAKE_BUILD_TYPE=Release)
+set(CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release)
 
 BUILD_DEP_TARGET()
 
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake
index 19c54b41a1..be00f123f8 100644
--- a/cmake/modules/FindRapidJSON.cmake
+++ b/cmake/modules/FindRapidJSON.cmake
@@ -25,8 +25,7 @@ if(ENABLE_INTERNAL_RapidJSON)
             COMMAND ${PATCH_EXECUTABLE} -p1 -i ${CORE_SOURCE_DIR}/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch
             COMMAND ${PATCH_EXECUTABLE} -p1 -i ${CORE_SOURCE_DIR}/tools/depends/target/rapidjson/003-win-arm64.patch)
 
-  set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DRAPIDJSON_BUILD_DOC=OFF
+  set(CMAKE_ARGS -DRAPIDJSON_BUILD_DOC=OFF
                  -DRAPIDJSON_BUILD_EXAMPLES=OFF
                  -DRAPIDJSON_BUILD_TESTS=OFF
                  -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF)
diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake
index acb064a0d1..15503546f7 100644
--- a/cmake/modules/FindSpdlog.cmake
+++ b/cmake/modules/FindSpdlog.cmake
@@ -36,14 +36,13 @@ if(ENABLE_INTERNAL_SPDLOG)
 
   set(SPDLOG_VERSION ${${MODULE}_VER})
 
-  set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
-                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+  set(CMAKE_ARGS -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
                  -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                  -DSPDLOG_BUILD_EXAMPLE=OFF
                  -DSPDLOG_BUILD_TESTS=OFF
                  -DSPDLOG_BUILD_BENCH=OFF
                  -DSPDLOG_FMT_EXTERNAL=ON
-                 -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                 -DCMAKE_PREFIX_PATH=${prefix}
                  "${EXTRA_ARGS}")
 
   BUILD_DEP_TARGET()
diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake
index b2273c5688..ab6357116c 100644
--- a/cmake/scripts/common/ModuleHelpers.cmake
+++ b/cmake/scripts/common/ModuleHelpers.cmake
@@ -65,13 +65,13 @@ function(get_versionfile_data module_name)
       endif()
 
       # Set Debug and Release library names
-      set(${UPPER_MODULE_NAME}_LIBRARY_DEBUG ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT_DEBUG} PARENT_SCOPE)
-      set(${UPPER_MODULE_NAME}_LIBRARY_RELEASE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT} PARENT_SCOPE)
+      set(${UPPER_MODULE_NAME}_LIBRARY_DEBUG ${DEPENDS_PATH}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT_DEBUG} PARENT_SCOPE)
+      set(${UPPER_MODULE_NAME}_LIBRARY_RELEASE ${DEPENDS_PATH}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT} PARENT_SCOPE)
     endif()
-    set(${UPPER_MODULE_NAME}_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT} PARENT_SCOPE)
+    set(${UPPER_MODULE_NAME}_LIBRARY ${DEPENDS_PATH}/lib/${${UPPER_MODULE_NAME}_BYPRODUCT} PARENT_SCOPE)
   endif()
 
-  set(${UPPER_MODULE_NAME}_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include PARENT_SCOPE)
+  set(${UPPER_MODULE_NAME}_INCLUDE_DIR ${DEPENDS_PATH}/include PARENT_SCOPE)
   set(${UPPER_MODULE_NAME}_VER ${${UPPER_MODULE_NAME}_VER} PARENT_SCOPE)
 
   if (${UPPER_MODULE_NAME}_BASE_URL)
@@ -131,6 +131,7 @@ macro(BUILD_DEP_TARGET)
 
   if(CMAKE_ARGS)
     set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS}
+                             -DCMAKE_INSTALL_PREFIX=${DEPENDS_PATH}
                              -DCMAKE_INSTALL_LIBDIR=lib)
     if(CMAKE_TOOLCHAIN_FILE)
       list(APPEND CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
@@ -186,6 +187,7 @@ macro(BUILD_DEP_TARGET)
                       DOWNLOAD_DIR ${TARBALL_DIR}
                       DOWNLOAD_NAME ${${MODULE}_ARCHIVE}
                       PREFIX ${CORE_BUILD_DIR}/${MODULE_LC}
+                      INSTALL_DIR ${DEPENDS_PATH}
                       ${CMAKE_ARGS}
                       ${PATCH_COMMAND}
                       ${CONFIGURE_COMMAND}
diff --git a/cmake/scripts/common/PathSetup.cmake b/cmake/scripts/common/PathSetup.cmake
new file mode 100644
index 0000000000..4948eb1d1e
--- /dev/null
+++ b/cmake/scripts/common/PathSetup.cmake
@@ -0,0 +1,7 @@
+# Platform path setup
+include(cmake/scripts/${CORE_SYSTEM_NAME}/PathSetup.cmake)
+
+# Fallback install location for dependencies built
+if(NOT DEPENDS_PATH)
+  set(DEPENDS_PATH "${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}")
+endif()