From 075cb93b4c4fb5337e965578f64fd2d92cc7704f Mon Sep 17 00:00:00 2001
From: Ryan Birmingham <birm@rbirm.us>
Date: Thu, 18 Jun 2020 10:44:08 -0400
Subject: [PATCH] shuffle conditions for potential windows portability

---
 CMake/FindArmadillo.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMake/FindArmadillo.cmake b/CMake/FindArmadillo.cmake
index 02a2100a99..af6e42a2cc 100644
--- a/CMake/FindArmadillo.cmake
+++ b/CMake/FindArmadillo.cmake
@@ -79,7 +79,7 @@ include(FindPackageHandleStandardArgs)
 # If _ARMA_USE_WRAPPER is set, then we just link to armadillo, but if it's not then we need support libraries instead
 set(_ARMA_SUPPORT_LIBRARIES)
 
-if(_ARMA_USE_WRAPPER AND NOT MSVC)
+if(_ARMA_USE_WRAPPER)
   # UNIX paths are standard, no need to write.
   find_library(ARMADILLO_LIBRARY
     NAMES armadillo
@@ -89,6 +89,8 @@ if(_ARMA_USE_WRAPPER AND NOT MSVC)
 else()
   # don't link to armadillo in this case
   set(ARMADILLO_LIBRARY "")
+endif()
+if(NOT _ARMA_USE_WRAPPER OR MSVC)
   if(_ARMA_USE_LAPACK)
     if(ARMADILLO_FIND_QUIETLY OR NOT ARMADILLO_FIND_REQUIRED)
       find_package(LAPACK QUIET)