microsoft · shaoboyan · Oct 28, 2024 · Oct 29, 2024
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -17,6 +17,11 @@ cmake_policy(SET CMP0104 OLD)
 # Enable Hot Reload for MSVC compilers if supported.
 cmake_policy(SET CMP0141 NEW)
 
+# Disable subbuild system with CMP0168 NEW
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
+  cmake_policy(SET CMP0168 NEW)
+endif()
+
 # Project
 project(onnxruntime C CXX ASM)
 
@@ -381,10 +386,22 @@ if (onnxruntime_USE_ROCM)
 endif()
 
 
+get_filename_component(BUILD_DIR_NO_CONFIG "${CMAKE_BINARY_DIR}" DIRECTORY)
 
 # Single output director for all binaries
-set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Single output directory for all binaries.")
-
+get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if (isMultiConfig)
+  foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+    string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/bin CACHE PATH "Single output directory for all binaries.")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/lib CACHE PATH "Single output directory for all libararies.")
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/archive CACHE PATH "Single output directory for all archives.")
+  endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
+else()
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Single output directory for all binaries.")
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Single output directory for all libararies.")
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/arch CACHE PATH "Single output directory for all librarries." )
+endif()
 
 include(FetchContent)
 
@@ -631,6 +648,9 @@ if (WIN32)
     # Enable warning: data member 'member' will be initialized after data member 'member2' / base class 'base_class'
     list(APPEND ORT_WARNING_FLAGS "/w15038")
 
+    # This flag helps pass eigen3 build.
+    list(APPEND ORT_WARNING_FLAGS "/wd4996")
+
     # set linker flags to minimize the binary size.
     if (MSVC)
       foreach(type EXE STATIC SHARED)

diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake
@@ -10,7 +10,7 @@ set(ABSL_BUILD_TESTING OFF)
 set(ABSL_BUILD_TEST_HELPERS OFF)
 set(ABSL_USE_EXTERNAL_GOOGLETEST ON)
 if(Patch_FOUND AND WIN32)
-  set(ABSL_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/abseil/absl_windows.patch)
+  set(ABSL_PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 --input=${PROJECT_SOURCE_DIR}/patches/abseil/absl_windows.patch)
 else()
   set(ABSL_PATCH_COMMAND "")
 endif()
@@ -27,6 +27,9 @@ FetchContent_Declare(
     URL ${DEP_URL_abseil_cpp}
     URL_HASH SHA1=${DEP_SHA1_abseil_cpp}
     PATCH_COMMAND ${ABSL_PATCH_COMMAND}
+    SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/abseil_cpp-src
+    BINARY_DIR ${CMAKE_BINARY_DIR}/deps/abseil_cpp-build
+    DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/abseil_cpp-download
     FIND_PACKAGE_ARGS 20240722 NAMES absl
 )
 

diff --git a/cmake/external/composable_kernel.cmake b/cmake/external/composable_kernel.cmake
@@ -5,6 +5,10 @@ include(FetchContent)
 FetchContent_Declare(composable_kernel
   URL ${DEP_URL_composable_kernel}
   URL_HASH SHA1=${DEP_SHA1_composable_kernel}
+
+  SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/composable_kernel-src
+  BINARY_DIR ${CMAKE_BINARY_DIR}/deps/composable_kernel-build
+  DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/composable_kernel-download
   PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PATCH_CLANG} &&
                 ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PATCH_GFX12X}
 )

diff --git a/cmake/external/cudnn_frontend.cmake b/cmake/external/cudnn_frontend.cmake
@@ -3,6 +3,9 @@ FetchContent_Declare(
   cudnn_frontend
   URL ${DEP_URL_cudnn_frontend}
   URL_HASH SHA1=${DEP_SHA1_cudnn_frontend}
+  SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/cudnn_frontend-src
+  BINARY_DIR ${CMAKE_BINARY_DIR}/deps/cudnn_frontend-build
+  DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/cudnn_frontend-download
 )
 
 set(CUDNN_FRONTEND_BUILD_SAMPLES OFF)

diff --git a/cmake/external/cutlass.cmake b/cmake/external/cutlass.cmake
@@ -3,6 +3,9 @@ FetchContent_Declare(
   cutlass
   URL ${DEP_URL_cutlass}
   URL_HASH SHA1=${DEP_SHA1_cutlass}
+  SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/cutlass-src
+  BINARY_DIR ${CMAKE_BINARY_DIR}/deps/cutlass-build
+  DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/cutlass-download
 )
 
 FetchContent_GetProperties(cutlass)

diff --git a/cmake/external/dml.cmake b/cmake/external/dml.cmake
@@ -104,6 +104,9 @@ FetchContent_Declare(
     directx_headers
     URL ${DEP_URL_directx_headers}
     URL_HASH SHA1=${DEP_SHA1_directx_headers}
+    SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/directx_headers-src
+    BINARY_DIR ${CMAKE_BINARY_DIR}/deps/directx_headers-build
+    DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/directx_headers-download
 )
 
 FetchContent_Populate(directx_headers)

diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake
@@ -8,13 +8,19 @@ else ()
             eigen
             URL ${DEP_URL_eigen}
             URL_HASH SHA1=${DEP_SHA1_eigen}
-            PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/eigen/eigen-aix.patch
+            PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 --input=${PROJECT_SOURCE_DIR}/patches/eigen/eigen-aix.patch
+            SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/eigen-src
+            BINARY_DIR ${CMAKE_BINARY_DIR}/deps/eigen-build
+            DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/eigen-download
         )
     else()
         FetchContent_Declare(
             eigen
             URL ${DEP_URL_eigen}
             URL_HASH SHA1=${DEP_SHA1_eigen}
+            SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/eigen-src
+            BINARY_DIR ${CMAKE_BINARY_DIR}/deps/eigen-build
+            DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/eigen-download
         )
     endif()
 

diff --git a/cmake/external/extensions.cmake b/cmake/external/extensions.cmake
@@ -42,6 +42,9 @@ if (NOT onnxruntime_EXTENSIONS_OVERRIDDEN)
     extensions
     URL ${DEP_URL_extensions}
     URL_HASH SHA1=${DEP_SHA1_extensions}
+    SOURCE_DIR ${BUILD_DIR_NO_CONFIG}/_deps/extensions-src
+    BINARY_DIR ${CMAKE_BINARY_DIR}/deps/extensions-build
+    DOWNLOAD_DIR ${BUILD_DIR_NO_CONFIG}/_deps/extensions-download
   )
   onnxruntime_fetchcontent_makeavailable(extensions)
 else()
@@ -62,4 +65,3 @@ onnxruntime_add_include_to_target(noexcep_operators ${PROTOBUF_LIB} ${ABSEIL_LIB
 
 add_dependencies(ocos_operators ${onnxruntime_EXTERNAL_DEPENDENCIES})
 add_dependencies(ortcustomops ${onnxruntime_EXTERNAL_DEPENDENCIES})
-
diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake
@@ -146,7 +146,6 @@ macro(onnxruntime_fetchcontent_makeavailable)
     else()
       unset(__cmake_haveFpArgs)
     endif()
-
     FetchContent_GetProperties(${__cmake_contentName})
     if(NOT ${__cmake_contentNameLower}_POPULATED)
       FetchContent_Populate(${__cmake_contentName})