endif()
if(NOT ZLIB_FOUND)
- ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
+ ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
- set(ZLIB_LIBRARY zlib)
+ set(ZLIB_LIBRARY zlib CACHE INTERNAL "")
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
- set(ZLIB_INCLUDE_DIRS "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
+ set(ZLIB_INCLUDE_DIR "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}" CACHE INTERNAL "")
+ set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
ocv_parse_header2(ZLIB "${${ZLIB_LIBRARY}_SOURCE_DIR}/zlib.h" ZLIB_VERSION)
ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
if(NOT BUILD_JPEG_TURBO_DISABLE)
- set(JPEG_LIBRARY libjpeg-turbo)
+ set(JPEG_LIBRARY libjpeg-turbo CACHE INTERNAL "")
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg-turbo")
- set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src")
+ set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src" CACHE INTERNAL "")
else()
- set(JPEG_LIBRARY libjpeg)
+ set(JPEG_LIBRARY libjpeg CACHE INTERNAL "")
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
- set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
+ set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
endif()
+ set(JPEG_INCLUDE_DIRS "${JPEG_INCLUDE_DIR}")
endif()
macro(ocv_detect_jpeg_version header_file)
if(NOT TIFF_FOUND)
ocv_clear_vars(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
- set(TIFF_LIBRARY libtiff)
+ set(TIFF_LIBRARY libtiff CACHE INTERNAL "")
set(TIFF_LIBRARIES ${TIFF_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
- set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}")
+ set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}" CACHE INTERNAL "")
ocv_parse_header("${${TIFF_LIBRARY}_SOURCE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
endif()
if(WITH_WEBP AND NOT WEBP_FOUND
AND (NOT ANDROID OR HAVE_CPUFEATURES)
)
-
- set(WEBP_LIBRARY libwebp)
+ ocv_clear_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
+ set(WEBP_LIBRARY libwebp CACHE INTERNAL "")
set(WEBP_LIBRARIES ${WEBP_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libwebp")
- set(WEBP_INCLUDE_DIR "${${WEBP_LIBRARY}_SOURCE_DIR}/src")
+ set(WEBP_INCLUDE_DIR "${${WEBP_LIBRARY}_SOURCE_DIR}/src" CACHE INTERNAL "")
set(HAVE_WEBP 1)
endif()
if(NOT JASPER_FOUND)
ocv_clear_vars(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
- set(JASPER_LIBRARY libjasper)
+ set(JASPER_LIBRARY libjasper CACHE INTERNAL "")
set(JASPER_LIBRARIES ${JASPER_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
- set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
+ set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
endif()
set(HAVE_JASPER YES)
if(NOT PNG_FOUND)
ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
- set(PNG_LIBRARY libpng)
+ set(PNG_LIBRARY libpng CACHE INTERNAL "")
set(PNG_LIBRARIES ${PNG_LIBRARY})
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
- set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
+ set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}" CACHE INTERNAL "")
set(PNG_DEFINITIONS "")
ocv_parse_header("${PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
endif()
endif()
endif()
-if (WITH_GDCM)
+if(WITH_GDCM)
find_package(GDCM QUIET)
if(NOT GDCM_FOUND)
set(HAVE_GDCM NO)
bool operator()(int exit_status) const;
private:
// No implementation - assignment is unsupported.
- void operator=(const ExitedWithCode& other);
+ void operator=(const ExitedWithCode& other) = delete;
const int exit_code_;
};
step_(other.step_) {}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<T>* const base_;
T value_;
}
// No implementation - assignment is unsupported.
- void operator=(const RangeGenerator& other);
+ void operator=(const RangeGenerator& other) = delete;
const T begin_;
const T end_;
}; // class ValuesInIteratorRangeGenerator::Iterator
// No implementation - assignment is unsupported.
- void operator=(const ValuesInIteratorRangeGenerator& other);
+ void operator=(const ValuesInIteratorRangeGenerator& other) = delete;
const ContainerType container_;
}; // class ValuesInIteratorRangeGenerator
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray1& other);
+ void operator=(const ValueArray1& other) = delete;
const T1 v1_;
};
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray2& other);
+ void operator=(const ValueArray2& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray3& other);
+ void operator=(const ValueArray3& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray4& other);
+ void operator=(const ValueArray4& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray5& other);
+ void operator=(const ValueArray5& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray6& other);
+ void operator=(const ValueArray6& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray7& other);
+ void operator=(const ValueArray7& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray8& other);
+ void operator=(const ValueArray8& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray9& other);
+ void operator=(const ValueArray9& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray10& other);
+ void operator=(const ValueArray10& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray11& other);
+ void operator=(const ValueArray11& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray12& other);
+ void operator=(const ValueArray12& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray13& other);
+ void operator=(const ValueArray13& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray14& other);
+ void operator=(const ValueArray14& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray15& other);
+ void operator=(const ValueArray15& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray16& other);
+ void operator=(const ValueArray16& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray17& other);
+ void operator=(const ValueArray17& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray18& other);
+ void operator=(const ValueArray18& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray19& other);
+ void operator=(const ValueArray19& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray20& other);
+ void operator=(const ValueArray20& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray21& other);
+ void operator=(const ValueArray21& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray22& other);
+ void operator=(const ValueArray22& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray23& other);
+ void operator=(const ValueArray23& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray24& other);
+ void operator=(const ValueArray24& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray25& other);
+ void operator=(const ValueArray25& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray26& other);
+ void operator=(const ValueArray26& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray27& other);
+ void operator=(const ValueArray27& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray28& other);
+ void operator=(const ValueArray28& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray29& other);
+ void operator=(const ValueArray29& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray30& other);
+ void operator=(const ValueArray30& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray31& other);
+ void operator=(const ValueArray31& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray32& other);
+ void operator=(const ValueArray32& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray33& other);
+ void operator=(const ValueArray33& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray34& other);
+ void operator=(const ValueArray34& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray35& other);
+ void operator=(const ValueArray35& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray36& other);
+ void operator=(const ValueArray36& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray37& other);
+ void operator=(const ValueArray37& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray38& other);
+ void operator=(const ValueArray38& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray39& other);
+ void operator=(const ValueArray39& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray40& other);
+ void operator=(const ValueArray40& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray41& other);
+ void operator=(const ValueArray41& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray42& other);
+ void operator=(const ValueArray42& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray43& other);
+ void operator=(const ValueArray43& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray44& other);
+ void operator=(const ValueArray44& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray45& other);
+ void operator=(const ValueArray45& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray46& other);
+ void operator=(const ValueArray46& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray47& other);
+ void operator=(const ValueArray47& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray48& other);
+ void operator=(const ValueArray48& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray49& other);
+ void operator=(const ValueArray49& other) = delete;
const T1 v1_;
const T2 v2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const ValueArray50& other);
+ void operator=(const ValueArray50& other) = delete;
const T1 v1_;
const T2 v2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator2::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator2& other);
+ void operator=(const CartesianProductGenerator2& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator3::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator3& other);
+ void operator=(const CartesianProductGenerator3& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator4::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator4& other);
+ void operator=(const CartesianProductGenerator4& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator5::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator5& other);
+ void operator=(const CartesianProductGenerator5& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator6::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator6& other);
+ void operator=(const CartesianProductGenerator6& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator7::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator7& other);
+ void operator=(const CartesianProductGenerator7& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator8::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator8& other);
+ void operator=(const CartesianProductGenerator8& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator9::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator9& other);
+ void operator=(const CartesianProductGenerator9& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
}
// No implementation - assignment is unsupported.
- void operator=(const Iterator& other);
+ void operator=(const Iterator& other) = delete;
const ParamGeneratorInterface<ParamType>* const base_;
// begin[i]_ and end[i]_ define the i-th range that Iterator traverses.
}; // class CartesianProductGenerator10::Iterator
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductGenerator10& other);
+ void operator=(const CartesianProductGenerator10& other) = delete;
const ParamGenerator<T1> g1_;
const ParamGenerator<T2> g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder2& other);
+ void operator=(const CartesianProductHolder2& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder3& other);
+ void operator=(const CartesianProductHolder3& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder4& other);
+ void operator=(const CartesianProductHolder4& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder5& other);
+ void operator=(const CartesianProductHolder5& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder6& other);
+ void operator=(const CartesianProductHolder6& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder7& other);
+ void operator=(const CartesianProductHolder7& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder8& other);
+ void operator=(const CartesianProductHolder8& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder9& other);
+ void operator=(const CartesianProductHolder9& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
private:
// No implementation - assignment is unsupported.
- void operator=(const CartesianProductHolder10& other);
+ void operator=(const CartesianProductHolder10& other) = delete;
const Generator1 g1_;
const Generator2 g2_;
projects / platform / upstream / opencv.git / commitdiff