Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
7b651d13
Commit
7b651d13
authored
Nov 15, 2016
by
Thomas Fetzer
Browse files
[cmake] Automatically find external libraries in the external folder
parent
b1098ceb
Changes
2
Hide whitespace changes
Inline
Side-by-side
cmake/modules/FindGLPK.cmake
View file @
7b651d13
...
...
@@ -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
)
...
...
cmake/modules/FindNLOPT.cmake
View file @
7b651d13
...
...
@@ -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
)
...
...
Christoph Grüninger
@gruenich
mentioned in commit
fbd6c3ab
·
Dec 27, 2016
mentioned in commit
fbd6c3ab
mentioned in commit fbd6c3abec171e7c995890e727671af4139842c8
Toggle commit list
Christoph Grüninger
@gruenich
mentioned in merge request
!319 (merged)
·
Dec 27, 2016
mentioned in merge request
!319 (merged)
mentioned in merge request !319
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment