Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
5a097073
Commit
5a097073
authored
May 24, 2018
by
Jan Möbius
Browse files
Merge branch 'findersFromComiso' into 'master'
adopted cmake finders from comiso See merge request
!106
parents
b8906443
fece8218
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/FindCGAL.cmake
View file @
5a097073
...
...
@@ -39,20 +39,21 @@ IF (NOT APPLE )
# Look for the header file.
FIND_PATH
(
CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
PATHS
"
${
VS_SEARCH_PATH
}
/CGAL-4.12/include"
/usr/include
../../External/include
$ENV{CGAL_DIR}/include
"
${
VS_SEARCH_PATH
}
/CGAL-4.7/include"
/usr/include
../../External/include
$ENV{CGAL_DIR}/include
"C:/libs/CGAL-3.6/include"
"C:/Program Files/CGAL-3.5/include"
"C:/Program Files/CGAL-3.5/include"
"C:/Programme/CGAL-3.5/include"
"C:/libs/CGAL-3.5/include"
"C:/Program Files/CGAL-3.4/include"
"C:/Program Files/CGAL-3.4/include"
"C:/Programme/CGAL-3.4/include"
"C:/libs/CGAL-3.4/include"
"C:/Programme/CGAL-3.9/include"
"C:/Program Files/CGAL-3.9/include"
"C:/Program Files (x86)/CGAL-3.9/include"
${
module_file_path
}
/../../../External/include
)
"C:/Programme/CGAL-3.9/include"
"C:/Program Files/CGAL-3.9/include"
"C:/Program Files (x86)/CGAL-3.9/include"
${
module_file_path
}
/../../../External/include
)
ELSE
(
NOT APPLE
)
# Look for the header file.
FIND_PATH
(
CGAL_INCLUDE_DIR NAMES CGAL/auto_link/auto_link.h
...
...
@@ -85,10 +86,10 @@ IF(CGAL_INCLUDE_DIR )
include
(
CGAL_GeneratorSpecificSettings
)
find_path
(
CGAL_LIBRARY_DIR
NAMES
"CGAL-
${
CGAL_TOOLSET
}
-mt.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-gd.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.12.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.7.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.5.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-gd.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.12.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.7.lib"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.5.lib"
PATHS
"
${
CGAL_INCLUDE_DIR
}
/../lib"
DOC
"Directory containing the CGAL library"
)
...
...
@@ -96,9 +97,9 @@ IF(CGAL_INCLUDE_DIR )
# Binary dir for DLLs
find_path
(
CGAL_BIN_DIR
NAMES
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.12.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.7.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.5.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-gd.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.7.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-4.5.dll"
"CGAL-
${
CGAL_TOOLSET
}
-mt-gd.dll"
PATHS
"
${
CGAL_INCLUDE_DIR
}
/../bin"
DOC
"Directory containing the CGAL DLLs"
)
...
...
cmake/FindMETIS.cmake
View file @
5a097073
...
...
@@ -41,6 +41,7 @@ find_path(METIS_INCLUDE_DIR NAMES metis.h
"/usr/include/metis"
"/opt/local/include"
"/opt/local/include/metis"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.9/include/metis"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/metis"
)
...
...
@@ -49,6 +50,7 @@ find_library( METIS_LIBRARY_RELEASE
PATHS
"$ENV{IPOPT_HOME}/lib/"
"/usr/lib"
"/opt/local/lib"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.9/lib"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
...
...
@@ -57,6 +59,7 @@ find_library( METIS_LIBRARY_DEBUG
PATHS
"$ENV{IPOPT_HOME}/lib/"
"/usr/lib"
"/opt/local/lib"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.9/lib"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/lib"
)
...
...
cmake/FindMUMPS.cmake
View file @
5a097073
...
...
@@ -38,7 +38,7 @@ find_path(MUMPS_INCLUDE_DIR NAMES dmumps_c.h
PATHS
"$ENV{IPOPT_HOME}/ThirdParty/Mumps/MUMPS/include/"
"/usr/include/"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.9/include/mumps"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps
/include/
"
"
${
VS_SEARCH_PATH
}
Ipopt-3.12.4/Ipopt/MSVisualStudio/v8-ifort/installed/include/mumps"
)
find_library
(
MUMPS_LIBRARY_DEBUG
...
...
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