Преглед изворни кода

Fix Findpyside2.cmake and update package rev (#70)

* Fix Findpyside2.cmake and update package rev

Signed-off-by: Steve Pham <[email protected]>

* Fixed invalid character

Signed-off-by: Steve Pham <[email protected]>

* Remove duplicate ly_pip_install_local_package call

Signed-off-by: Steve Pham <[email protected]>
Steve Pham пре 3 година
родитељ
комит
73fee90e72

+ 9 - 7
package-system/pyside2-qt/Findpyside2.cmake.Linux

@@ -5,24 +5,26 @@
 #
 #
      
-# this file actually ingests the library and defines targets.
-     
 set(MY_NAME "pyside2")
 set(TARGET_WITH_NAMESPACE "3rdParty::${MY_NAME}")
 if (TARGET ${TARGET_WITH_NAMESPACE})
     return()
 endif()
-     
+
 add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-     
-ly_pip_install_local_package_editable(${CMAKE_CURRENT_LIST_DIR}/pyside2 pyside2)
 
-set(pyside2_RUNTIME_DEPENDENCIES
+set(PYSIDE_BASE_PATH ${CMAKE_CURRENT_LIST_DIR}/pyside2)
+
+ly_pip_install_local_package_editable(${PYSIDE_BASE_PATH} pyside2)
+
+set(${MY_NAME}_RUNTIME_DEPENDENCIES
     ${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14
     ${PYSIDE_BASE_PATH}/PySide2/libpyside2.abi3.so.5.14.2.3
     ${PYSIDE_BASE_PATH}/shiboken2/shiboken2.abi3.so
     ${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14
     ${PYSIDE_BASE_PATH}/shiboken2/libshiboken2.abi3.so.5.14.2.3
 )
-     
+ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES})
+
 set(${MY_NAME}_FOUND True)
+

+ 1 - 1
package-system/pyside2-qt/build_config.json

@@ -2,7 +2,7 @@
     "git_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
     "git_tag": "v5.14.2.3",
     "package_name": "pyside2",
-    "package_version": "5.15.2-rev1",
+    "package_version": "5.15.2-rev2",
     "package_url": "https://code.qt.io/cgit/pyside/pyside-setup.git",
     "package_license": "custom",
     "package_license_file": "pyside2/LICENSE.LGPLv3",

+ 2 - 2
package_build_list_host_linux.json

@@ -16,7 +16,7 @@
         "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
         "OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean",
         "OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL/build_package_image.py",
-        "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",
+        "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",
         "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",
         "PhysX-4.1.2.29882248-rev5-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
@@ -48,7 +48,7 @@
         "mcpp-2.7.2_az.1-rev1-linux": "package-system/mcpp-linux",
         "OpenMesh-8.1-rev3-linux": "package-system/OpenMesh-linux",
         "OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL-linux",
-        "pyside2-5.15.2-rev1-linux": "package-system/pyside2-linux",
+        "pyside2-5.15.2-rev2-linux": "package-system/pyside2-linux",
         "ilmbase-2.3.0-rev4-linux": "package-system/ilmbase-linux",
         "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
         "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",