generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaner fix

Browse Source
This commit is contained in:
Vincent Rabaud 2013-11-14 11:45:42 +01:00
parent ee7c74ceeb
commit 8e944cfe70
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/templates/OpenCVConfig.cmake.in
View File

@ -16,7 +16,6 @@
# If the module is found then OPENCV_<MODULE>_FOUND is set to TRUE. # If the module is found then OPENCV_<MODULE>_FOUND is set to TRUE.
# #
# This file will define the following variables: # This file will define the following variables:
# - OpenCV_FOUND : Set to TRUE is OpenCV was find_packaged before
# - OpenCV_LIBS : The list of all imported targets for OpenCV modules. # - OpenCV_LIBS : The list of all imported targets for OpenCV modules.
# - OpenCV_INCLUDE_DIRS : The OpenCV include directories. # - OpenCV_INCLUDE_DIRS : The OpenCV include directories.
# - OpenCV_COMPUTE_CAPABILITIES : The version of compute capability # - OpenCV_COMPUTE_CAPABILITIES : The version of compute capability
@ -37,17 +36,14 @@
# #
# =================================================================================== # ===================================================================================
if(OpenCV_FOUND)
return()
endif()
set(OpenCV_FOUND TRUE)
set(modules_file_suffix "") set(modules_file_suffix "")
if(ANDROID) if(ANDROID)
string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}") string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
endif() endif()
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake) if(NOT TARGET opencv_core)
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
endif()
# TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files) # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)