Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
loadbalancing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SLMS
loadbalancing
Commits
93d81bb9
Commit
93d81bb9
authored
Feb 14, 2019
by
Rene Halver
Browse files
Options
Downloads
Patches
Plain Diff
always compile bundled voro++ version
parent
8677fc0f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+4
-19
4 additions, 19 deletions
CMakeLists.txt
with
4 additions
and
19 deletions
CMakeLists.txt
+
4
−
19
View file @
93d81bb9
...
@@ -26,25 +26,10 @@ if(CM_ALL_VTK_OUTPUT)
...
@@ -26,25 +26,10 @@ if(CM_ALL_VTK_OUTPUT)
endif
(
CM_ALL_VTK_OUTPUT
)
endif
(
CM_ALL_VTK_OUTPUT
)
if
(
CM_ALL_VORONOI
)
if
(
CM_ALL_VORONOI
)
find_package
(
VORO
)
message
(
STATUS
"compiling voro++ version in contrib/voro++"
)
if
(
NOT VORO_FOUND
)
message
(
STATUS
"voro++ not found by cmake, trying to find voro++ in system"
)
find_library
(
CM_ALL_VORO_LIB voro++ PATH_SUFFIXES lib
)
find_path
(
CM_ALL_VORO_INC
"voro++.hh"
PATH_SUFFIXES include
)
if
(
CM_ALL_VORO_LIB AND CM_ALL_VORO_INC
)
message
(
STATUS
"voro++ found in system, using system version"
)
elseif
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/contrib/voro++
)
message
(
STATUS
"voro++ not found in system, compiling version in contrib/voro++"
)
add_subdirectory
(
contrib/voro++
)
add_subdirectory
(
contrib/voro++
)
set
(
CM_ALL_VORO_INC ../contrib/voro++/include
)
set
(
CM_ALL_VORO_INC ../contrib/voro++/include
)
set
(
CM_ALL_VORO_LIB
"-L../contrib/voro++/src -lvoro"
)
set
(
CM_ALL_VORO_LIB
"-L../contrib/voro++/src -lvoro"
)
else
()
message
(
FATAL_ERROR
"no version of voro++ found, cannot use CM_ALL_VORONOI!"
)
endif
()
else
()
set
(
CM_ALL_VORO_INC
${
VORO_INCLUDE_DIRS
}
)
set
(
CM_ALL_VORO_LIB
${
VORO_LIBRARY_DIRS
}
)
endif
()
add_compile_options
(
"-DALL_VORONOI"
)
add_compile_options
(
"-DALL_VORONOI"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment