Mercurial > hg > orthanc

changeset 7182:e3b3fe54b737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
targetting microsoft windows
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 22 Oct 2026 10:36:31 +0200
parents 47665da83409
children a1cbbafee4ae
files OrthancFramework/Resources/CMake/OpenSslConfigurationStatic.cmake
diffstat 1 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic.cmake	Thu Oct 22 10:00:34 2026 +0200
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic.cmake	Thu Oct 22 10:36:31 2026 +0200
@@ -56,9 +56,24 @@
 
   # Execute the "config" script from the OpenSSL source distribution
   if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
-    set(Options --with-rand-seed=devrandom)
+    set(Options no-asm --with-rand-seed=devrandom linux-x86_64)
+  elseif (MSVC)
+    # This is Visual Studio
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+      set(Options no-asm VC-WIN32)
+    else()
+      set(Options no-asm VC-WIN64A)
+    endif()
+  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND CMAKE_COMPILER_IS_GNUCXX)
+    # This is MinGW
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+      set(Options no-asm mingw)
+    else()
+      set(Options no-asm mingw64)
+    endif()
   else()
-    set(Options)
+    # Generic system
+    set(Options no-asm)
   endif()
 
   execute_process(