Commit b5039f0f authored by Jan Möbius's avatar Jan Möbius

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
...@@ -8,25 +8,28 @@ include_directories ( ...@@ -8,25 +8,28 @@ include_directories (
find_package(Boost 1.43.0) find_package(Boost 1.43.0)
if(Boost_FOUND) if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
else()
set (USE_IN_SOURCE_TREE_BOOST true) # Add target for first example
endif() add_executable(file_converter EXCLUDE_FROM_ALL ovm_converter.cc)
add_dependencies(file_converter OpenVolumeMesh)
# Add target for first example
add_executable(file_converter EXCLUDE_FROM_ALL ovm_converter.cc) if(NOT WIN32)
add_dependencies(file_converter OpenVolumeMesh)
# Link against all necessary libraries
if(NOT WIN32) target_link_libraries(file_converter OpenVolumeMesh)
# Link against all necessary libraries # Set output directory to ${BINARY_DIR}/FileConverter
target_link_libraries(file_converter OpenVolumeMesh) set_target_properties(file_converter PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/FileConverter)
# Set output directory to ${BINARY_DIR}/FileConverter else()
set_target_properties(file_converter PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/FileConverter)
# Link against all necessary libraries
target_link_libraries(file_converter OpenVolumeMesh)
endif()
else() else()
# Link against all necessary libraries message(STATUS "Boost not found. Disabling file_converter.")
target_link_libraries(file_converter OpenVolumeMesh)
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment