Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert changes needed for windows build with azure #2656

Merged
merged 1 commit into from Dec 19, 2021
Merged

revert changes needed for windows build with azure #2656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion cmake/Modules/FindAzureSDK_EP.cmake
View file
Open in desktop
Expand Up @@ -94,6 +94,10 @@ if (NOT AZURESDK_FOUND)
endif()

if (WIN32)
if(MSVC)
set(CXXFLAGS_DEF " -I${TILEDB_EP_INSTALL_PREFIX}/include /Dazure_storage_lite_EXPORTS /DCURL_STATICLIB=1 ${CMAKE_CXX_FLAGS}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory the only thing that should make a difference here is /DCURL_STATICLIB=1.

set(CFLAGS_DEF " -I${TILEDB_EP_INSTALL_PREFIX}/include /Dazure_storage_lite_EXPORTS ${CMAKE_C_FLAGS}")
endif()
# needed for applying patches on windows
find_package(Git REQUIRED)
#see comment on this answer - https://stackoverflow.com/a/45698220
Expand Down Expand Up @@ -122,7 +126,8 @@ if (NOT AZURESDK_FOUND)
-DCURL_NO_CURL_CMAKE=ON
-DCMAKE_PREFIX_PATH=${TILEDB_EP_INSTALL_PREFIX}
-DCMAKE_INSTALL_PREFIX=${TILEDB_EP_AZURE_INSTALL_PREFIX}
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-DCMAKE_CXX_FLAGS=${CXXFLAGS_DEF}
-DCMAKE_C_FLAGS=${CFLAGS_DEF}
PATCH_COMMAND
cd ${CMAKE_SOURCE_DIR} &&
${GIT_EXECUTABLE} apply --ignore-whitespace -p1 --unsafe-paths --verbose --directory=${TILEDB_EP_SOURCE_DIR}/ep_azuresdk < ${TILEDB_CMAKE_INPUTS_DIR}/patches/ep_azuresdk/v0.3.0-patchset.patch
Expand Down