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
Etienne Schmitt
CGoGN
Commits
5c094db0
Commit
5c094db0
authored
Oct 10, 2012
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug with boost 1.5 (thanks to Alex Hurstel)
parent
a67bbdf2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CMakeLists.txt
CMakeLists.txt
+2
-1
apps_cmake.txt
apps_cmake.txt
+2
-1
include/Geometry/distances.hpp
include/Geometry/distances.hpp
+1
-1
No files found.
CMakeLists.txt
View file @
5c094db0
...
...
@@ -27,7 +27,7 @@ IF(WIN32)
ENDIF
(
WIN32
)
find_package
(
OpenGL REQUIRED
)
find_package
(
Boost COMPONENTS regex thread REQUIRED
)
find_package
(
Boost COMPONENTS regex thread
system
REQUIRED
)
find_package
(
ZLIB REQUIRED
)
find_package
(
LibXml2 REQUIRED
)
find_package
(
GLEW REQUIRED
)
...
...
@@ -82,6 +82,7 @@ SET (CGoGN_EXT_LIBS
${
GLEW_LIBRARIES
}
${
ZLIB_LIBRARIES
}
${
LIBXML2_LIBRARIES
}
${
Boost_SYSTEM_LIBRARY
}
${
Boost_REGEX_LIBRARY
}
${
Boost_THREAD_LIBRARY
}
)
...
...
apps_cmake.txt
View file @
5c094db0
...
...
@@ -34,7 +34,7 @@ ENDIF(WIN32)
find_package(OpenGL REQUIRED)
find_package(Boost COMPONENTS regex thread REQUIRED)
find_package(Boost COMPONENTS regex thread
system
REQUIRED)
find_package(ZLIB REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(GLEW REQUIRED)
...
...
@@ -65,6 +65,7 @@ SET (COMMON_LIBS
${GLEW_LIBRARIES}
${ZLIB_LIBRARIES}
${LIBXML2_LIBRARIES}
${Boost_SYSTEM_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_THREAD_LIBRARY} )
...
...
include/Geometry/distances.hpp
View file @
5c094db0
...
...
@@ -239,7 +239,7 @@ typename VEC3::DATA_TYPE squaredDistanceLine2Seg(const VEC3& A, const VEC3& AB,
}
template
<
typename
VEC3
>
float
squaredDistanceSeg2Point
(
const
VEC3
&
A
,
const
VEC3
&
AB
,
typename
VEC3
::
DATA_TYPE
AB2
,
const
VEC3
&
P
)
typename
VEC3
::
DATA_TYPE
squaredDistanceSeg2Point
(
const
VEC3
&
A
,
const
VEC3
&
AB
,
typename
VEC3
::
DATA_TYPE
AB2
,
const
VEC3
&
P
)
{
typedef
typename
VEC3
::
DATA_TYPE
T
;
...
...
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