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
CoMISo
CoMISo
Commits
b66443e8
Commit
b66443e8
authored
May 24, 2018
by
schultz
Browse files
added search path for cgal 4.7 and VS2013 on our lab machines
[skip ci]
parent
4df5005d
Pipeline
#7074
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
cmake/FindCGAL.cmake
View file @
b66443e8
...
...
@@ -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"
)
...
...
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