Skip to content

Commit d58c705

Browse files
committed
revert CMake changes
1 parent d7bbd9b commit d58c705

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ if (XCODE)
115115
set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME OFF)
116116
endif()
117117

118-
if (WIN32)
119-
# Ensure Windows SDK exposes newer APIs like PPROCESSOR_NUMBER
120-
# https://github.com/aws/aws-iot-device-sdk-cpp-v2/issues/427
121-
add_compile_definitions(_WIN32_WINNT=0x0601)
122-
endif()
123-
124118
# Create a single static library that combines all the individual libs
125119
# We do this to work around issues with link order when including multiple
126120
# `staticLibraries` in the cinterop file.

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeTasks.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ private fun Project.registerCmakeConfigureTask(
123123
}
124124
}
125125

126-
if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
127-
args.add("-G")
128-
args.add("MSYS Makefiles")
129-
}
126+
// if (HostManager.hostIsMingw && knTarget.konanTarget.family == Family.MINGW) {
127+
// args.add("-G")
128+
// args.add("MSYS Makefiles")
129+
// }
130130

131131
// FIXME? Compiling s2n-tls on GitHub Actions Ubuntu image (without Docker / cross-compilation) has errors like:
132132
// In function ‘s2n_hash_algorithms_init’

0 commit comments

Comments
 (0)