geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject geode-native git commit: GEODE-3135: Fixes Windows 32-bit OpenSSL build.
Date Wed, 28 Jun 2017 18:11:13 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop d92d8cdd7 -> b6d9cc3a9


GEODE-3135: Fixes Windows 32-bit OpenSSL build.

- Disables assembly


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/b6d9cc3a
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/b6d9cc3a
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/b6d9cc3a

Branch: refs/heads/develop
Commit: b6d9cc3a93dcc102360de69ba28be57a36af2385
Parents: d92d8cd
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Wed Jun 28 11:10:34 2017 -0700
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Wed Jun 28 11:10:50 2017 -0700

----------------------------------------------------------------------
 src/dependencies/openssl/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/b6d9cc3a/src/dependencies/openssl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/openssl/CMakeLists.txt b/src/dependencies/openssl/CMakeLists.txt
index b95b344..33d80d8 100644
--- a/src/dependencies/openssl/CMakeLists.txt
+++ b/src/dependencies/openssl/CMakeLists.txt
@@ -52,8 +52,8 @@ elseif ("Windows" STREQUAL ${CMAKE_SYSTEM_NAME})
     set( openssl_PLATFORM $<$<CONFIG:Debug>:debug->VC-WIN64A )
 	set( openssl_WINDOWS_CMD cmd /c ms\\do_win64a)
   else()
-    set( openssl_PLATFORM $<$<CONFIG:Debug>:debug->VC-WIN32 )
-	set( openssl_WINDOWS_CMD cmd /c ms\\do_nt)
+    set( openssl_PLATFORM $<$<CONFIG:Debug>:debug->VC-WIN32 no-asm)
+	set( openssl_WINDOWS_CMD cmd /c ms\\do_ms)
   endif()
 endif()
 


Mime
View raw message