Skip to content

Commit 72d36a4

Browse files
authored
Merge pull request libgit2#6794 from stinb/windows-arm-build
cmake: remove workaround that isn't compatible with Windows on ARM
2 parents 8afdad0 + 387d01c commit 72d36a4

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/libgit2/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ set_target_properties(libgit2package PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJE
6565
set_target_properties(libgit2package PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
6666
set_target_properties(libgit2package PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
6767

68-
# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
69-
# Win64+MSVC+static libs = linker error
70-
if(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
71-
set_target_properties(libgit2package PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
72-
endif()
73-
7468
ide_split_sources(libgit2package)
7569

7670
if(SONAME)

0 commit comments

Comments
 (0)