diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 154a677d..0987cfd4 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,23 +1,5 @@
 include(findcoredeps)
-
-find_package(PythonInterp)
-find_package(PythonLibs)
-
-FIND_PACKAGE(SWIG 3.0)
-
-# We test building this library with python instead of java since that is easier to do and both languages should work
-
-if (${PYTHONLIBS_FOUND} AND ${SWIG_FOUND})
-    if (NOT WIN32)
-        set(BUILD_SWIG_LIB TRUE)
-    elseif("${CMAKE_EXE_LINKER_FLAGS}" MATCHES "x64")
-        set(BUILD_SWIG_LIB TRUE)
-    else()
-        MESSAGE(INFO " Skipping ovpncli swig build on non-x64 arch: ${CMAKE_EXE_LINKER_FLAGS}")
-    endif()
-else()
-    MESSAGE(INFO " Python libraries or swig not found, skipping ovpncli swig build")
-endif()
+include(findswigdeps)
 
 if (${BUILD_SWIG_LIB})
     add_custom_command(
diff --git a/cmake/findswigdeps.cmake b/cmake/findswigdeps.cmake
new file mode 100644
index 00000000..c2faec3f
--- /dev/null
+++ b/cmake/findswigdeps.cmake
@@ -0,0 +1,18 @@
+find_package(PythonInterp)
+find_package(PythonLibs)
+
+FIND_PACKAGE(SWIG 3.0)
+
+# We test building this library with python instead of java since that is easier to do and both languages should work
+
+if (PYTHONLIBS_FOUND AND SWIG_FOUND)
+    if (NOT WIN32)
+        set(BUILD_SWIG_LIB TRUE)
+    elseif("${CMAKE_EXE_LINKER_FLAGS}" MATCHES "x64")
+        set(BUILD_SWIG_LIB TRUE)
+    else()
+        MESSAGE(INFO " Skipping swig builds on non-x64 Windows: ${CMAKE_EXE_LINKER_FLAGS}")
+    endif()
+else()
+    MESSAGE(INFO " Python libraries or swig not found, skipping swig builds")
+endif()