Merge pull request #1642 from alalek:cmake_cleanup_targets

df279150 · Roman Donchenko · OpenCV Buildbot · 4cbf0cb3 · 83b7fbe3 · df279150
Commit df279150 authored Oct 18, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 18, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CMakeLists.txt CMakeLists.txt +2 -0

OpenCVUtils.cmake cmake/OpenCVUtils.cmake +0 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,8 @@ endif()

 include(cmake/OpenCVUtils.cmake)

+ocv_clear_vars(OpenCVModules_TARGETS)
+
 # ----------------------------------------------------------------------------
 # Break in case of popular CMake configuration mistakes
 # ----------------------------------------------------------------------------

--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
@@ -458,7 +458,6 @@ function(ocv_install_target)

  if(DEFINED __package)
    list(APPEND ${__package}_TARGETS ${__target})
-    list(REMOVE_DUPLICATES ${__package}_TARGETS)
    set(${__package}_TARGETS "${${__package}_TARGETS}" CACHE INTERNAL "List of ${__package} targets")
  endif()