Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
surfseg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
patmjen
surfseg
Commits
35d0f834
Commit
35d0f834
authored
Jun 28, 2019
by
Patrick M. Jensen
Browse files
Options
Downloads
Patches
Plain Diff
Fix errors in CMakeLists.txt
parent
22af0b12
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
surfseg/matlab/CMakeLists.txt
+3
-3
3 additions, 3 deletions
surfseg/matlab/CMakeLists.txt
surfseg/src/CMakeLists.txt
+0
-2
0 additions, 2 deletions
surfseg/src/CMakeLists.txt
with
3 additions
and
5 deletions
surfseg/matlab/CMakeLists.txt
+
3
−
3
View file @
35d0f834
...
@@ -4,7 +4,7 @@ set (MESH_LIB_ROOT_DIR ${PROJECT_SOURCE_DIR}/../MESH)
...
@@ -4,7 +4,7 @@ set (MESH_LIB_ROOT_DIR ${PROJECT_SOURCE_DIR}/../MESH)
if
(
Matlab_FOUND
)
if
(
Matlab_FOUND
)
include_directories
(
${
Matlab_INCLUDE_DIRS
}
)
include_directories
(
${
Matlab_INCLUDE_DIRS
}
)
include_directories
(
${
PROJECT_SOURCE_DIR
}
/
Demo
/include
${
PROJECT_SOURCE_DIR
}
/
Demo
/src
)
include_directories
(
${
PROJECT_SOURCE_DIR
}
/
surfseg
/include
${
PROJECT_SOURCE_DIR
}
/
surfseg
/src
)
include_directories
(
${
GEL_LIB_ROOT_DIR
}
/src
${
MESH_LIB_ROOT_DIR
}
${
MESH_LIB_ROOT_DIR
}
/lib3d/include
)
include_directories
(
${
GEL_LIB_ROOT_DIR
}
/src
${
MESH_LIB_ROOT_DIR
}
${
MESH_LIB_ROOT_DIR
}
/lib3d/include
)
if
(
WIN32
)
if
(
WIN32
)
link_directories
(
${
MESH_LIB_ROOT_DIR
}
/build/x64-
${
CMAKE_BUILD_TYPE
}
)
link_directories
(
${
MESH_LIB_ROOT_DIR
}
/build/x64-
${
CMAKE_BUILD_TYPE
}
)
...
...
This diff is collapsed.
Click to expand it.
surfseg/src/CMakeLists.txt
+
0
−
2
View file @
35d0f834
...
@@ -3,8 +3,6 @@ cmake_minimum_required (VERSION 3.5)
...
@@ -3,8 +3,6 @@ cmake_minimum_required (VERSION 3.5)
# Specify targets
# Specify targets
add_library
(
surfseg STATIC graph.cpp MaxFlow.cpp surface_segment.cpp manifold_mesh.cpp util.cpp subdivided_icosahedron.cpp tet_mesh_4d.cpp surface_segment_4d.cpp
)
add_library
(
surfseg STATIC graph.cpp MaxFlow.cpp surface_segment.cpp manifold_mesh.cpp util.cpp subdivided_icosahedron.cpp tet_mesh_4d.cpp surface_segment_4d.cpp
)
target_compile_definitions
(
SurfSegment PRIVATE NO_OPENGL
)
target_compile_definitions
(
SmoothMesh PRIVATE NO_OPENGL
)
target_compile_definitions
(
surfseg PRIVATE NO_OPENGL
)
target_compile_definitions
(
surfseg PRIVATE NO_OPENGL
)
set_property
(
TARGET surfseg PROPERTY POSITION_INDEPENDENT_CODE ON
)
set_property
(
TARGET surfseg PROPERTY POSITION_INDEPENDENT_CODE ON
)
...
...
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
register
or
sign in
to comment