Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
b5039f0f
Commit
b5039f0f
authored
Jan 12, 2017
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_boost' into 'master'
disable file_converter if boost is not found. See merge request
!17
parents
832fcfdb
6a5b3b49
Pipeline
#4118
passed with stage
in 3 minutes and 43 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
18 deletions
+21
-18
src/FileConverter/CMakeLists.txt
src/FileConverter/CMakeLists.txt
+21
-18
No files found.
src/FileConverter/CMakeLists.txt
View file @
b5039f0f
...
...
@@ -8,25 +8,28 @@ include_directories (
find_package
(
Boost 1.43.0
)
if
(
Boost_FOUND
)
include_directories
(
${
Boost_INCLUDE_DIRS
}
)
else
()
set
(
USE_IN_SOURCE_TREE_BOOST true
)
endif
()
# Add target for first example
add_executable
(
file_converter EXCLUDE_FROM_ALL ovm_converter.cc
)
add_dependencies
(
file_converter OpenVolumeMesh
)
if
(
NOT WIN32
)
# Link against all necessary libraries
target_link_libraries
(
file_converter OpenVolumeMesh
)
# Set output directory to ${BINARY_DIR}/FileConverter
set_target_properties
(
file_converter PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/FileConverter
)
# Add target for first example
add_executable
(
file_converter EXCLUDE_FROM_ALL ovm_converter.cc
)
add_dependencies
(
file_converter OpenVolumeMesh
)
if
(
NOT WIN32
)
# Link against all necessary libraries
target_link_libraries
(
file_converter OpenVolumeMesh
)
# Set output directory to ${BINARY_DIR}/FileConverter
set_target_properties
(
file_converter PROPERTIES RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/FileConverter
)
else
()
# Link against all necessary libraries
target_link_libraries
(
file_converter OpenVolumeMesh
)
endif
()
else
()
# Link against all necessary libraries
target_link_libraries
(
file_converter OpenVolumeMesh
)
message
(
STATUS
"Boost not found. Disabling file_converter."
)
endif
()
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