diff --git a/gtsam/navigation/GPSFactor.h b/gtsam/navigation/GPSFactor.h
index f4ef6c49a..6902f81f1 100644
--- a/gtsam/navigation/GPSFactor.h
+++ b/gtsam/navigation/GPSFactor.h
@@ -31,7 +31,7 @@ namespace gtsam {
  * See Farrell08book or e.g. http://www.dirsig.org/docs/new/coordinates.html
  * @addtogroup Navigation
  */
-class GPSFactor: public NoiseModelFactor1<Pose3> {
+class GTSAM_EXPORT GPSFactor: public NoiseModelFactor1<Pose3> {
 
 private:
 
diff --git a/gtsam/navigation/tests/CMakeLists.txt b/gtsam/navigation/tests/CMakeLists.txt
index 2f3c0883a..b03b8167c 100644
--- a/gtsam/navigation/tests/CMakeLists.txt
+++ b/gtsam/navigation/tests/CMakeLists.txt
@@ -7,12 +7,22 @@ set(tests_excluded "")
 if(GTSAM_INSTALL_GEOGRAPHICLIB)
   # If we're installing GeographicLib, use the one we're compiling
   include_directories(${PROJECT_SOURCE_DIR}/gtsam/3rdparty/GeographicLib/include)
-  list(APPEND test_link_libraries GeographicLib)
+  if(MSVC)
+    list(APPEND test_link_libraries GeographicLib_STATIC)
+  else()
+    list(APPEND test_link_libraries GeographicLib)
+  endif()
+
 else()
   if(GEOGRAPHICLIB_FOUND)
     # If we're not installing, but it's already installed, use the installed one
     include_directories(${GeographicLib_INCLUDE_DIRS})
-    list(APPEND test_link_libraries ${GeographicLib_LIBRARIES})
+    list(APPEND test_link_libraries )
+	#if(MSVC)
+    #  list(APPEND test_link_libraries GeographicLib_STATIC)
+    #else()
+      list(APPEND test_link_libraries ${GeographicLib_LIBRARIES})
+    #endif()
   else()
     # We don't have GeographicLib
     set(tests_excluded testGeographicLib.cpp testGPSFactor.cpp testMagFactor.cpp)