X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwlaunchpadtasklet%2FCMakeLists.txt;fp=rwlaunchpad%2Fplugins%2Frwlaunchpadtasklet%2FCMakeLists.txt;h=c02e72824314f9639711c2cda8d3ab12ca23ddd2;hb=4870d0ee29789b859931e4e2c73e13dcb29537d5;hp=34463eff796a532ed48c1d40f3a06ce4a154752d;hpb=6f1a3fe149e4a6b9803382cb299c902f4cf58ec9;p=osm%2FSO.git diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt index 34463eff..c02e7282 100644 --- a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt +++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt @@ -24,7 +24,7 @@ set(TASKLET_NAME rwlaunchpad) ## # This function creates an install target for the plugin artifacts ## -rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py) +rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT}) # Workaround RIFT-6485 - rpmbuild defaults to python2 for # anything not in a site-packages directory so we have to @@ -34,7 +34,6 @@ rift_python_install_tree( FILES rift/tasklets/${TASKLET_NAME}/__init__.py rift/tasklets/${TASKLET_NAME}/convert_pkg.py - rift/tasklets/${TASKLET_NAME}/datacenters.py rift/tasklets/${TASKLET_NAME}/export.py rift/tasklets/${TASKLET_NAME}/extract.py rift/tasklets/${TASKLET_NAME}/image.py @@ -44,16 +43,14 @@ rift_python_install_tree( rift/tasklets/${TASKLET_NAME}/tasklet.py rift/tasklets/${TASKLET_NAME}/tosca.py rift/tasklets/${TASKLET_NAME}/uploader.py - COMPONENT ${PKG_LONG_NAME} + COMPONENT ${INSTALL_COMPONENT} PYTHON3_ONLY) rift_python_install_tree( FILES rift/package/__init__.py rift/package/archive.py - rift/package/charm.py rift/package/checksums.py - rift/package/config.py rift/package/convert.py rift/package/handler.py rift/package/icon.py @@ -62,7 +59,7 @@ rift_python_install_tree( rift/package/script.py rift/package/store.py rift/package/cloud_init.py - COMPONENT ${PKG_LONG_NAME} + COMPONENT ${INSTALL_COMPONENT} PYTHON3_ONLY) rift_add_subdirs(test scripts)