diff --git a/CMakeLists.txt b/CMakeLists.txt
index d36a581fb..b68962e97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,7 +258,7 @@ if(OPENMP_FOUND)
       set(OPENMP_DLL VCOMP120)
     elseif(MSVC_VERSION EQUAL 1900)
       set(OPENMP_DLL VCOMP140)
-    elseif(MSVC_VERSION EQUAL 1910)
+    elseif(MSVC_VERSION MATCHES "^191[0-9]$")
       set(OPENMP_DLL VCOMP140)
     endif()
     if(OPENMP_DLL)
@@ -327,9 +327,9 @@ endif(WITH_PNG)
 # Qhull
 option(WITH_QHULL "Include convex-hull operations" TRUE)
 if(WITH_QHULL)
-  if(NOT PCL_SHARED_LIBS OR WIN32)
+  if(NOT PCL_SHARED_LIBS)
     set(QHULL_USE_STATIC ON)
-  endif(NOT PCL_SHARED_LIBS OR WIN32)
+  endif(NOT PCL_SHARED_LIBS)
   find_package(Qhull)
   if(QHULL_FOUND)
     include_directories(${QHULL_INCLUDE_DIRS})