Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
86a39503
Commit
86a39503
authored
Jun 24, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved eigen and gmm to general subdir in libs directory
parent
0f74077a
Pipeline
#2235
failed with stage
in 2143 minutes and 4 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
cmake/FindEIGEN3.cmake
cmake/FindEIGEN3.cmake
+1
-0
cmake/FindGMM.cmake
cmake/FindGMM.cmake
+8
-0
No files found.
cmake/FindEIGEN3.cmake
View file @
86a39503
...
...
@@ -37,6 +37,7 @@ find_path( EIGEN3_INCLUDE_DIR
/usr/local/include
/usr/local/include/eigen3/
/opt/local/include/eigen3/
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/general/Eigen-3.2.6"
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/Eigen-3.2.6"
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/Eigen-3.2.6/include"
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/Eigen-3.2.1"
...
...
cmake/FindGMM.cmake
View file @
86a39503
...
...
@@ -10,6 +10,13 @@ if (GMM_INCLUDE_DIR)
set
(
GMM_INCLUDE_DIRS
"
${
GMM_INCLUDE_DIR
}
"
)
else
(
GMM_INCLUDE_DIR
)
# Check if the base path is set
if
(
NOT CMAKE_WINDOWS_LIBS_DIR
)
# This is the base directory for windows library search used in the finders we shipp.
set
(
CMAKE_WINDOWS_LIBS_DIR
"c:/libs"
CACHE STRING
"Default Library search dir on windows."
)
endif
()
find_path
(
GMM_INCLUDE_DIR
NAMES gmm/gmm.h
PATHS $ENV{GMM_DIR}
...
...
@@ -20,6 +27,7 @@ find_path( GMM_INCLUDE_DIR
"c:
\\
libs
\\
gmm-4.2
\\
include"
"c:
\\
libs
\\
gmm-4.1
\\
include"
"c:
\\
libs
\\
gmm-3.0
\\
include"
"
${
CMAKE_WINDOWS_LIBS_DIR
}
/general/gmm-4.2"
${
PROJECT_SOURCE_DIR
}
/MacOS/Libs/gmm-3.1/include
../../External/include
/ACG/acgdev/gcc-4.3-i686/gmm-4.1/include/
...
...
Write
Preview
Markdown
is supported
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