diff --git a/cmake/modules/FindGLPK.cmake b/cmake/modules/FindGLPK.cmake index 9883ba2868848c1d312d5c88b21a327f14f9693c..ad2590240afcbb35a9d612cb340ecdb2803bbc4f 100644 --- a/cmake/modules/FindGLPK.cmake +++ b/cmake/modules/FindGLPK.cmake @@ -14,7 +14,9 @@ # look for header files, only at positions given by the user find_path(GLPK_INCLUDE_DIR NAMES glpk.h - PATHS ${GLPK_PREFIX} ${GLPK_ROOT} + PATHS ${GLPK_PREFIX} + ${GLPK_ROOT} + "${CMAKE_SOURCE_DIR}/../external/glpk" PATH_SUFFIXES "glpk" "include/glpk" "include" "SRC" "src" NO_DEFAULT_PATH ) @@ -28,8 +30,10 @@ find_path(GLPK_INCLUDE_DIR # look for library, only at positions given by the user find_library(GLPK_LIBRARY NAMES "glpk" - PATHS ${GLPK_PREFIX} ${GLPK_ROOT} ${GLPK_ROOT}/src/ ${GLPK_ROOT}/src/.libs/ - PATH_SUFFIXES "lib" "lib32" "lib64" "libglpk" + PATHS ${GLPK_PREFIX} + ${GLPK_ROOT} + "${CMAKE_SOURCE_DIR}/../external/glpk" + PATH_SUFFIXES "lib" "lib32" "lib64" "libglpk" "src" "src/.libs" NO_DEFAULT_PATH ) diff --git a/cmake/modules/FindNLOPT.cmake b/cmake/modules/FindNLOPT.cmake index e2a83e7b98440568624384ae513aa8669e86c5e2..2dfb17210fc2e21eb1f9ab89e8e0efe195172524 100644 --- a/cmake/modules/FindNLOPT.cmake +++ b/cmake/modules/FindNLOPT.cmake @@ -14,7 +14,9 @@ # look for header files, only at positions given by the user find_path(NLOPT_INCLUDE_DIR NAMES nlopt.h - PATHS ${NLOPT_PREFIX} ${NLOPT_ROOT} + PATHS ${NLOPT_PREFIX} + ${NLOPT_ROOT} + "${CMAKE_SOURCE_DIR}/../external/nlopt" PATH_SUFFIXES "nlopt" "include/nlopt" "include" "SRC" "src" "api" NO_DEFAULT_PATH ) @@ -28,8 +30,11 @@ find_path(NLOPT_INCLUDE_DIR # look for library, only at positions given by the user find_library(NLOPT_LIBRARY NAMES "nlopt" - PATHS ${NLOPT_PREFIX} ${NLOPT_ROOT} ${NLOPT_ROOT}/.libs/ - PATH_SUFFIXES "lib" "lib32" "lib64" "libnlopt" + PATHS ${NLOPT_PREFIX} + ${NLOPT_ROOT} + ${NLOPT_ROOT} + "${CMAKE_SOURCE_DIR}/../external/nlopt" + PATH_SUFFIXES "lib" "lib32" "lib64" "libnlopt" ".libs" NO_DEFAULT_PATH )