diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d59719..5cca9f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,17 +54,19 @@ SEARCH_FOR_BOOST()
 # Libtool dynamic loading
 # This project does not use Libtool directly but still uses ltdl for
 # plug-in loading.
-SET(LIB_LTDL LIB_LTDL-NOTFOUND)
-FIND_LIBRARY(LIB_LTDL libltdl${CMAKE_SHARED_LIBRARY_SUFFIX})
-IF (NOT LIB_LTDL)
-  MESSAGE(FATAL_ERROR
-    "Failed to find Libtool ltdl library, check that Libtool ltdl is installed.")
-ENDIF()
 INCLUDE(CheckIncludeFileCXX)
-CHECK_INCLUDE_FILE_CXX(ltdl.h LTDL_H_FOUND)
-IF (NOT LTDL_H_FOUND)
-  MESSAGE(FATAL_ERROR
-    "Failed to find ltdl.h, check that Libtool ltdl is installed.")
+IF(NOT WIN32)
+  SET(LIB_LTDL LIB_LTDL-NOTFOUND)
+  FIND_LIBRARY(LIB_LTDL libltdl${CMAKE_SHARED_LIBRARY_SUFFIX})
+  IF (NOT LIB_LTDL)
+    MESSAGE(FATAL_ERROR
+      "Failed to find Libtool ltdl library, check that Libtool ltdl is installed.")
+  ENDIF()
+  CHECK_INCLUDE_FILE_CXX(ltdl.h LTDL_H_FOUND)
+  IF (NOT LTDL_H_FOUND)
+    MESSAGE(FATAL_ERROR
+      "Failed to find ltdl.h, check that Libtool ltdl is installed.")
+  ENDIF()
 ENDIF()
 
 # Search for roboptim-core.
diff --git a/cmake b/cmake
index 7cdd214..5663a00 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 7cdd2146508a3431adb8e5a0d4233704080299cd
+Subproject commit 5663a002a905b5c8d84a69d8e74044a8e34a48ed
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e17ba8..0bf2ffa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,7 +30,7 @@ MACRO(IPOPT_PLUGIN NAME)
   INSTALL(TARGETS roboptim-core-plugin-${NAME}
     DESTINATION ${PLUGINDIR})
   PKG_CONFIG_USE_DEPENDENCY(roboptim-core-plugin-${NAME} ipopt)
-  PKG_CONFIG_USE_COMPILE_DEPENDENCY(roboptim-core-plugin-${NAME} roboptim-core)
+  PKG_CONFIG_USE_DEPENDENCY(roboptim-core-plugin-${NAME} roboptim-core)
 
   # Make sure all symbols are defined.
   # See:
diff --git a/tests/shared-tests b/tests/shared-tests
index 17023f3..79d1351 160000
--- a/tests/shared-tests
+++ b/tests/shared-tests
@@ -1 +1 @@
-Subproject commit 17023f3e57936f60ce392fc778aaf1005e206427
+Subproject commit 79d1351475a297c76f8353a3626d962d06e31f8a