Require Matlab MX_LIBRARY component (#154)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18fe7b2556dcbc51a91587d266865f93aaf59494..8fbcf61e6df2bd246bc9d4587828a2ffbd7fff95 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,7 +298,7 @@ if (NLOPT_OCTAVE)
 endif ()
 
 if (NLOPT_MATLAB)
-  find_package (Matlab)
+  find_package (Matlab COMPONENTS MX_LIBRARY)
 endif ()
 
 if (OCTAVE_FOUND OR Matlab_FOUND)

diff --git a/octave/CMakeLists.txt b/octave/CMakeLists.txt
index 8586720d2394f1da250c0f389d35a6b782ee4b71..192d9b293b8a1ec43ebbabfdd6cbfb00cae376ae 100644 (file)
--- a/octave/CMakeLists.txt
+++ b/octave/CMakeLists.txt
@@ -2,7 +2,7 @@ set (MFILES NLOPT_GN_DIRECT.m NLOPT_GN_DIRECT_L.m NLOPT_GN_DIRECT_L_RAND.m NLOPT
 set (M_DATA ${MFILES} nlopt_minimize.m nlopt_minimize_constrained.m)
 
 
-if (Matlab_FOUND)
+if (Matlab_FOUND AND Matlab_MX_LIBRARY)
   cmake_minimum_required (VERSION 3.3) # for the matlab_add_mex macro
 
   matlab_add_mex (NAME nlopt_optimize-mex SRC nlopt_optimize-mex.c OUTPUT_NAME nlopt_optimize LINK_TO ${nlopt_lib})