Skip to content

Commit 73fee90

Browse files
authored
Fix Findpyside2.cmake and update package rev (#70)
* Fix Findpyside2.cmake and update package rev Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Fixed invalid character Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Remove duplicate ly_pip_install_local_package call Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
1 parent 03a063e commit 73fee90

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

package-system/pyside2-qt/Findpyside2.cmake.Linux

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,26 @@
55
#
66
#
77

8-
# this file actually ingests the library and defines targets.
9-
108
set(MY_NAME "pyside2")
119
set(TARGET_WITH_NAMESPACE "3rdParty::${MY_NAME}")
1210
if (TARGET ${TARGET_WITH_NAMESPACE})
1311
return()
1412
endif()
15-
13+
1614
add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
17-
18-
ly_pip_install_local_package_editable(${CMAKE_CURRENT_LIST_DIR}/pyside2 pyside2)
1915

20-
set(pyside2_RUNTIME_DEPENDENCIES
16+
set(PYSIDE_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/pyside2)
17+
18+
ly_pip_install_local_package_editable(${PYSIDE_BASE_PATH} pyside2)
19+
20+
set(${MY_NAME}_RUNTIME_DEPENDENCIES
2121
${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14
2222
${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14.2.3
2323
${PYSIDE_BASE_PATH}/shiboken2/shiboken2.abi3.so
2424
${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14
2525
${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14.2.3
2626
)
27-
27+
ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})
28+
2829
set(${MY_NAME}_FOUND True)
30+

package-system/pyside2-qt/build_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"git_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
33
"git_tag": "v5.14.2.3",
44
"package_name": "pyside2",
5-
"package_version": "5.15.2-rev1",
5+
"package_version": "5.15.2-rev2",
66
"package_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
77
"package_license": "custom",
88
"package_license_file": "pyside2/LICENSE.LGPLv3",

package_build_list_host_linux.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
1717
"OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean",
1818
"OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL/build_package_image.py",
19-
"pyside2-5.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2-qt --platform-name Linux --package-root ../../package-system --clean",
19+
"pyside2-5.15.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2-qt --platform-name Linux --package-root ../../package-system --clean",
2020
"ilmbase-2.3.0-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux --package-root ../../package-system --clean",
2121
"PhysX-4.1.2.29882248-rev5-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
2222
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
@@ -48,7 +48,7 @@
4848
"mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp-linux",
4949
"OpenMesh-8.1-rev3-linux": "package-system/OpenMesh-linux",
5050
"OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL-linux",
51-
"pyside2-5.15.2-rev1-linux": "package-system/pyside2-linux",
51+
"pyside2-5.15.2-rev2-linux": "package-system/pyside2-linux",
5252
"ilmbase-2.3.0-rev4-linux": "package-system/ilmbase-linux",
5353
"SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
5454
"squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",

0 commit comments

Comments
 (0)