Commit c94aa2a4 authored by jcfr's avatar jcfr
Browse files

COMP: Remove reference to OpenCV from Slicer/CMakeLists.txt

OpenCV used to be required by the OpenCV module. When this module and
associated tests will be ported to Slicer4, adding OpenCV as an external
project or as a dependency of the openCV extension could be considered.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16489 3bd1e089-480b-0410-8dfb-8563597acbee
parent ee142f24
......@@ -120,7 +120,6 @@ OPTION(Slicer_USE_NUMPY "Build Slicer with NumPy" ON)
OPTION(Slicer_USE_BatchMake "Build Slicer with BatchMake support." ON)
OPTION(Slicer_USE_MIDAS "Build Slicer with MIDAS support." OFF)
OPTION(Slicer_USE_OPENIGTLINK "Build Slicer with OpenIGTLink support." ON)
OPTION(Slicer_USE_OPENCV "Build Slicer with OpenCV support." OFF)
OPTION(Slicer_USE_CTKAPPLAUNCHER "Configure ctkAppLauncher." ON)
MARK_AS_ADVANCED(Slicer_USE_CTKAPPLAUNCHER)
SET(Slicer_VTK_GIT_REPOSITORY "github.com/Slicer/VTK.git" CACHE STRING "repository from which to get VTK")
......@@ -400,32 +399,6 @@ IF(Slicer_USE_OPENIGTLINK)
INCLUDE(${OpenIGTLink_USE_FILE})
ENDIF()
#-----------------------------------------------------------------------------
# OpenCV (Built in Slicer3-lib)
#-----------------------------------------------------------------------------
IF(Slicer_USE_OPENCV)
FIND_PACKAGE(OpenCV REQUIRED)
IF(OPENCV_BUILD_SETTINGS_FILE AND NOT SKIP_OPENCV_BUILD_SETTINGS_FILE)
INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
CMAKE_IMPORT_BUILD_SETTINGS(${OPENCV_BUILD_SETTINGS_FILE})
ENDIF()
# Add compiler flags needed to use OPENCV.
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENCV_REQUIRED_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENCV_REQUIRED_CXX_FLAGS}")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OPENCV_REQUIRED_LINK_FLAGS}")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OPENCV_REQUIRED_LINK_FLAGS}")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${OPENCV_REQUIRED_LINK_FLAGS}")
# Add include directories needed to use OPENCV.
INCLUDE_DIRECTORIES(BEFORE ${OPENCV_INCLUDE_DIRS})
# Add link directories needed to use OPENCV.
LINK_DIRECTORIES(${OPENCV_LIBRARY_DIRS})
#INCLUDE(${OPENCV_USE_FILE})
ENDIF()
#-----------------------------------------------------------------------------
# Need some Tcl/Tk info
#-----------------------------------------------------------------------------
......
......@@ -54,7 +54,6 @@ if(Slicer_USE_BatchMake)
endif()
SET(CTK_DIR_CONFIG ${CTK_DIR})
SET(ITK_DIR_CONFIG ${ITK_DIR})
SET(OpenCV_DIR_CONFIG ${OpenCV_DIR})
SET(PYTHON_INCLUDE_PATH_CONFIG ${PYTHON_INCLUDE_PATH})
SET(PYTHON_LIBRARIES_CONFIG ${PYTHON_LIBRARIES})
SET(Teem_DIR_CONFIG ${Teem_DIR})
......
......@@ -32,7 +32,6 @@ if(Slicer_USE_BatchMake)
endif()
set(CTK_DIR "@CTK_DIR_CONFIG@")
set(ITK_DIR "@ITK_DIR_CONFIG@")
set(OpenCV_DIR "@OpenCV_DIR_CONFIG@")
set(PYTHON_INCLUDE_PATH "@PYTHON_INCLUDE_PATH@")
set(PYTHON_LIBRARIES "@PYTHON_LIBRARIES@")
set(Teem_DIR "@Teem_DIR_CONFIG@")
......
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