1722264892

Author: Oleh Kulykov

CMakeLists.txt

@@ -98,31 +98,22 @@ More info: https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run
 
 # ---- definitions ----
 if (WIN32 OR WIN64)
-  if (WIN32)
-    message("WIN32")
-  endif()
-  if (WIN64)
-    message("WIN64")
-  endif()
   add_definitions(-DUNICODE=1)
   add_definitions(-D_UNICODE=1)
-endif()
-
-if (MSVC)
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    # Defined as 1 when the compilation target is 64-bit ARM or x64. Otherwise, undefined.
-    message("MSVC 64")
+  if (WIN64 OR CMAKE_SIZEOF_VOID_P EQUAL 8)
+    message("WIN 64")
     add_definitions(-DWIN64=1)
     add_definitions(-D_WIN64=1)
-  elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # Defined as 1 when the compilation target is 32-bit ARM, 64-bit ARM, x86, or x64. Otherwise, undefined.
-    message("MSVC 32")
+  elseif (WIN32 OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+    message("WIN 32")
     add_definitions(-DWIN32=1)
     add_definitions(-D_WIN32=1)
   else()
-    message("MSVC undefined")
+    message("WIN.. undefined")
   endif()
+endif()
 
+if (MSVC)
   # Run-Time Library
   # https://learn.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library
   if (LIBPLZMA_OPT_MSVC_MULTITHREAD_STATIC)