mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
[kddockwidgets] Update to 2.0.0 (#35882)
* update g2o * update version * update kddockwidgets * update version * undo g2o --------- Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
parent
8e8743cbe6
commit
e25c595cbd
@ -1,15 +0,0 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 6c174b89a..b83bace53 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -127,8 +127,8 @@ endif()
|
|
||||||
if(${PROJECT_NAME}_QT6)
|
|
||||||
set(Qt_VERSION_MAJOR 6)
|
|
||||||
set(QT_MIN_VERSION "6.0.0")
|
|
||||||
- find_package(Qt6Widgets ${QT_MIN_VERSION} REQUIRED)
|
|
||||||
- find_package(Qt6Test ${QT_MIN_VERSION} REQUIRED)
|
|
||||||
+ find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets REQUIRED)
|
|
||||||
+ find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Test)
|
|
||||||
set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
|
|
||||||
else()
|
|
||||||
set(Qt_VERSION_MAJOR 5)
|
|
@ -1,11 +1,9 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO KDAB/KDDockWidgets
|
REPO KDAB/KDDockWidgets
|
||||||
REF 9990300006854afa4b4fa796912da067e770046a
|
REF "v${VERSION}"
|
||||||
SHA512 2207b3c021957d9be8652cad24c0b5e37b07fa02ffeeeb7dab57feaeade7973b580b853d6b69db15015b62cc1397459e27d032131292baaeb17a0633e287fa3c
|
SHA512 4dccf24e901ab58d645478bc62ff9e72224dc11c3f39c53f5be5b188ece1bf8c682d50a42ece7a38400adfeb6147336795fcb86e903fd0957949c83f852c9b53
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
|
||||||
fix_find_package.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KD_STATIC)
|
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KD_STATIC)
|
||||||
@ -24,7 +22,6 @@ vcpkg_cmake_configure(
|
|||||||
${_qarg_OPTIONS}
|
${_qarg_OPTIONS}
|
||||||
-DKDDockWidgets_QT6=ON
|
-DKDDockWidgets_QT6=ON
|
||||||
-DKDDockWidgets_STATIC=${KD_STATIC}
|
-DKDDockWidgets_STATIC=${KD_STATIC}
|
||||||
-DKDDockWidgets_QTQUICK=OFF
|
|
||||||
-DKDDockWidgets_PYTHON_BINDINGS=OFF
|
-DKDDockWidgets_PYTHON_BINDINGS=OFF
|
||||||
-DKDDockWidgets_EXAMPLES=OFF
|
-DKDDockWidgets_EXAMPLES=OFF
|
||||||
)
|
)
|
||||||
@ -39,4 +36,4 @@ endif()
|
|||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "kddockwidgets",
|
"name": "kddockwidgets",
|
||||||
"version": "1.5.0",
|
"version": "2.0.0",
|
||||||
"description": "KDAB's Dock Widget Framework for Qt",
|
"description": "KDAB's Dock Widget Framework for Qt",
|
||||||
"homepage": "https://www.kdab.com/development-resources/qt-tools/kddockwidgets/",
|
"homepage": "https://www.kdab.com/development-resources/qt-tools/kddockwidgets/",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -3745,7 +3745,7 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"kddockwidgets": {
|
"kddockwidgets": {
|
||||||
"baseline": "1.5.0",
|
"baseline": "2.0.0",
|
||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"kealib": {
|
"kealib": {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "5dcce3389ff415798302c843980052dd03314ddc",
|
||||||
|
"version": "2.0.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62",
|
"git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62",
|
||||||
"version": "1.5.0",
|
"version": "1.5.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user