Hack something together

Tom-Newton · Aug 20, 2023 · 78300c5 · 78300c5
1 parent 8b81a1e
commit 78300c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -293,8 +293,8 @@ macro(arrow_add_werror_if_debug)
     string(APPEND CMAKE_C_FLAGS_DEBUG " /WX")
     string(APPEND CMAKE_CXX_FLAGS_DEBUG " /WX")
   else()
-    string(APPEND CMAKE_C_FLAGS_DEBUG " -Werror")
-    string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Werror")
+    string(APPEND CMAKE_C_FLAGS_DEBUG "")
+    string(APPEND CMAKE_CXX_FLAGS_DEBUG "")
   endif()
 endmacro()
 

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -5076,15 +5076,20 @@ function(build_azure_sdk)
     set(BUILD_TESTING FALSE)
     set(BUILD_TRANSPORT_CURL OFF)
     set(BUILD_WINDOWS_UWP TRUE)
+    set(WARNINGS_AS_ERRORS OFF)
     set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY TRUE)
     set(DISABLE_AZURE_CORE_OPENTELEMETRY TRUE)
-    message(STATUS "SDK source dir ${azure_sdk_SOURCE_DIR}")
+    # set(FETCH_SOURCE_DEPS ON)
+    set(AZ_ALL_LIBRARIES ON)
+    message(STATUS "SDK source dir ${azure_sdk_SOURCE_DIR} ${azure_sdk_BINARY_DIR}")
     # add_subdirectory(${azure_sdk_SOURCE_DIR} ${azure_sdk_BINARY_DIR} EXCLUDE_FROM_ALL)
-    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/core/azure-core ${azure_sdk_BINARY_DIR}/sdk/core/azure-core EXCLUDE_FROM_ALL)
-    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/identity/azure-identity ${azure_sdk_BINARY_DIR}/sdk/identity/azure-identity EXCLUDE_FROM_ALL)
-    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-blobs ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-blobs EXCLUDE_FROM_ALL)
-    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-common ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-common EXCLUDE_FROM_ALL)
-    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-files-datalake ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-files-datalake EXCLUDE_FROM_ALL)
+    # add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/core/azure-core ${azure_sdk_BINARY_DIR} EXCLUDE_FROM_ALL)
+
+    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/core/azure-core ${azure_sdk_BINARY_DIR}/sdk/core/azure-core)
+    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/identity/azure-identity ${azure_sdk_BINARY_DIR}/sdk/identity/azure-identity)
+    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-blobs ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-blobs)
+    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-common ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-common)
+    add_subdirectory(${azure_sdk_SOURCE_DIR}/sdk/storage/azure-storage-files-datalake ${azure_sdk_BINARY_DIR}/sdk/storage/azure-storage-files-datalake)
 
 
   endif()