mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 12:39:02 +08:00
acb370dd6d
* [OpenCV] update to v3.4.18 and v4.6.0 enable python2 in vcpkg-get-python-package * fix references * remove python2 from testing * restore python2 tests only on windows&x64 * fix references * [OpenCV2] add jasper patch * fix references * update handling multiple versions * add usage files * [dbow] fix build * [dbow] fix version * fix references * remove ipp from vcpkg-ci-opencv for opencv3 * [OpenCV2] fix CRT linking with static libs * fix references * [dbow3] add support clause now that is CI tested [cctag] enable opencv4, fix build on osx * fix references * [OpenCV2] fix patch * fix references * [libharu] bump version * fix references * [rtabmap] fix for opencv 4.6 * [rtabmap] fix manifest * fix references * remove llvm dependency to ease CI load * version * overwrite version * fixes for mingw * add mingw patch * fix references * [OpenCV2] fix generated config on win32 * fix references * update version * update version * overwrite baseline * cleanup after merge * fix references * [openmvs] trying to diagnose the problem - DO NOT MERGE * fix references * restore port version * fix references * Revert "[openmvs] trying to diagnose the problem - DO NOT MERGE" This reverts commit8bfd0ff4f9. * Revert "fix references" This reverts commit0e915f6eef. * skip opencv2 and opencv3 * remove again opencv2/3 from vcpkg-ci-opencv * apply fixes from review * fix references * wrong checksum (tested on windows) * Github-actions fixes (#2) * Update opencv4.json * fix github-actions issues * formating vcpkg.json * update git-trees * fix rtabmap license * fix references * fix also dbow3 license * fix references * [cctag] remove unnecessary patch section * fix references Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: FrankXie <v-frankxie@microsoft.com> Co-authored-by: Matthieu Penant <matthieu.penant@seika.ca> Co-authored-by: Matthieu Penant <thieum22@hotmail.com>
19 lines
583 B
Diff
19 lines
583 B
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -966,13 +966,13 @@ IF(ANDROID)
|
|
IF(BUILD_APP)
|
|
ADD_SUBDIRECTORY( app )
|
|
ENDIF(BUILD_APP)
|
|
+ELSEIF(NOT WITH_QT)
|
|
+ MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...")
|
|
ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND))
|
|
ADD_SUBDIRECTORY( guilib )
|
|
IF(BUILD_APP)
|
|
ADD_SUBDIRECTORY( app )
|
|
ENDIF(BUILD_APP)
|
|
-ELSEIF(WITH_QT)
|
|
- MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...")
|
|
ENDIF()
|
|
|
|
IF(BUILD_TOOLS)
|