Commit 1ab2c71d authored by Ben Boeckel's avatar Ben Boeckel

wipwipwip

parent 976fc548
......@@ -193,15 +193,6 @@ if (SMTK_ENABLE_VXL_SUPPORT)
message(FATAL_ERROR "vxl must be built with BUILD_RPL_RGTL enabled")
endif(NOT VXL_RPL_RGTL_FOUND)
include(${VXL_CMAKE_DIR}/UseVXL.cmake)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${VXL_RPL_INCLUDE_DIR})
#include_directories(${VTKExtensions_SOURCE_DIR})
# Use the standard VXL include directories.
include_directories(${VXL_VCL_INCLUDE_DIR} ${VXL_CORE_INCLUDE_DIR})
# Add link directories needed to use VXL.
include_directories(${VXL_LIBRARY_DIR})
# Build the Tensor Voting library.
add_subdirectory(rtvl)
......
......@@ -3,7 +3,7 @@
# (See accompanying file rtvl_license_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
add_library(rtvl STATIC
set(rtvl_headers
rtvl_intpow.hxx
rtvl_terms.hxx
rtvl_tokens.hxx
......@@ -17,6 +17,10 @@ add_library(rtvl STATIC
rtvl_weight.hxx
rtvl_weight_original.hxx rtvl_weight_original.txx
rtvl_weight_smooth.hxx rtvl_weight_smooth.txx
)
add_library(rtvl STATIC
${rtvl_headers}
Templates/rtvl_vote+2-.cxx
Templates/rtvl_votee+2-.cxx
......@@ -48,15 +52,27 @@ set(ignore_rules_for_rtvl "")
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
CMAKE_CXX_COMPILER_ID MATCHES "Intel")
#Silence warning about std::auto_ptr being deprecated.
set(ignore_rules_for_rtvl
"${ignore_rules_for_rtvl} -Wno-deprecated-declarations")
#Silence warning about unused parameters.
set(ignore_rules_for_rtvl
"${ignore_rules_for_rtvl} -Wno-unused-parameter")
target_compile_definitions(rtvl
PRIVATE
# Silence warning about std::auto_ptr being deprecated.
-Wno-deprecated-declarations
# Silence warning about unused parameters.
-Wno-unused-parameter)
endif()
set_property(TARGET rtvl APPEND_STRING
PROPERTY COMPILE_FLAGS ${ignore_rules_for_rtvl})
target_include_directories(rtvl
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
$<INSTALL_INTERFACE:include>
${VXL_RPL_INCLUDE_DIR}
${VXL_VCL_INCLUDE_DIR}
${VXL_CORE_INCLUDE_DIR})
target_link_libraries(rtvl ${RGTL_LIBRARY} ${VNL_ALGO_LIBRARY} ${VNL_LIBRARY} ${V3P_NETLIB_LIBRARY})
install(TARGETS rtvl
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
install(FILES ${rtvl_headers}
DESTINATION include/rtvl)
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