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

Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR

Browse Source 
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
This commit is contained in:
Alexander Nitsch 2015-02-20 19:54:14 +01:00
parent 9665e08bac
commit c2944dbc0c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,9 +47,11 @@ endif()
if(NOT TARGET opencv_core) if(NOT TARGET opencv_core)
# Extract directory name from full path of the file currently being processed. # Extract directory name from full path of the file currently being processed.
# Note that CMake 2.8.3 introduced CMAKE_CURRENT_LIST_DIR, but we do this # Note that CMake 2.8.3 introduced CMAKE_CURRENT_LIST_DIR. We reimplement it
# manually to support older versions of CMake as well. # for older versions of CMake to support these as well.
if(CMAKE_VERSION VERSION_LESS "2.8.3")
get_filename_component(CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
endif()
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake) include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
endif() endif()