msvc fixes

Author: sdrobert

Diff for: python/BuildStandalone.cmake

@@ -20,6 +20,7 @@ Python_add_library(
   ${KENLM_PYTHON_STANDALONE_SRCS} python/kenlm.cpp
 )
 
+set_property(TARGET kenlm PROPERTY CXX_STANDARD 11)
 target_include_directories(kenlm PRIVATE ${PROJECT_SOURCE_DIR})
 target_compile_definitions(kenlm PRIVATE KENLM_MAX_ORDER=${KENLM_MAX_ORDER})
 

Diff for: setup.py

@@ -1,6 +1,5 @@
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext as _build_ext
-import glob
 import platform
 import subprocess
 import os
@@ -40,7 +39,6 @@ def run(self):
             "-DBUILD_SHARED_LIBS=ON",
             "-DBUILD_PYTHON_STANDALONE=ON",
             f"-DKENLM_MAX_ORDER={max_order}",
-            f"-DPYTHON_EXECUTABLE={sys.executable}",
             f"-DCMAKE_PROJECT_VERSION={VERSION}",
         ]
         cfg = "Debug" if self.debug else "Release"
@@ -55,8 +53,9 @@ def run(self):
             ]
             if sys.maxsize > 2**32:
                 cmake_args += ["-A", "x64"]
+            # build_args += ["--", "/m"]
         else:
-            cmake_args += ["-DCMAKE_BUILD_TYPE=" + cfg]
+            cmake_args.append(f"-DCMAKE_BUILD_TYPE={cfg}")
 
         env = os.environ.copy()
         env["CXXFLAGS"] = '{} -fPIC -DVERSION_INFO=\\"{}\\"'.format(

Diff for: util/read_compressed.cc

@@ -168,11 +168,11 @@ class GZip {
 
     void SetOutput(void *to, std::size_t amount) {
       stream_.next_out = static_cast<Bytef*>(to);
-      stream_.avail_out = std::min<std::size_t>(std::numeric_limits<uInt>::max(), amount);
+      stream_.avail_out = std::min<std::size_t>((std::numeric_limits<uInt>::max)(), amount);
     }
 
     void SetInput(const void *base, std::size_t amount) {
-      assert(amount < static_cast<std::size_t>(std::numeric_limits<uInt>::max()));
+      assert(amount < static_cast<std::size_t>((std::numeric_limits<uInt>::max)()));
       stream_.next_in = const_cast<Bytef*>(static_cast<const Bytef*>(base));
       stream_.avail_in = amount;
     }
@@ -225,7 +225,7 @@ class BZip {
 
     void SetOutput(void *base, std::size_t amount) {
       stream_.next_out = static_cast<char*>(base);
-      stream_.avail_out = std::min<std::size_t>(std::numeric_limits<unsigned int>::max(), amount);
+      stream_.avail_out = std::min<std::size_t>((std::numeric_limits<unsigned int>::max)(), amount);
     }
 
     void SetInput(const void *base, std::size_t amount) {