also install additions py files in their directory (#7000)

3nids · web-flow · commit cd34da80389b · 2018-05-15T05:02:08.000-08:00
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -316,14 +316,13 @@ ENDFOREACH(pyfile)
 FOREACH(module ${PY_MODULES})
   ADD_CUSTOM_TARGET(py${module} ALL)
   ADD_DEPENDENCIES(py${module} python_module_qgis__${module})
-  FILE(GLOB_RECURSE PY_FILES "${module}/*.py")
-  INSTALL(FILES ${PY_FILES} DESTINATION "${QGIS_PYTHON_DIR}/${module}")
+  FILE(GLOB_RECURSE PY_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${module}/*.py)
+  INSTALL(FILES ${PY_FILES} DESTINATION "${QGIS_PYTHON_DIR}")
   FOREACH(pyfile ${PY_FILES})
-    FILE(RELATIVE_PATH subdir ${CMAKE_CURRENT_SOURCE_DIR}/${module} ${pyfile})
     ADD_CUSTOM_COMMAND(TARGET py${module}
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E make_directory "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${module}"
-      COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${module}/${subdir}"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${QGIS_PYTHON_OUTPUT_DIRECTORY}"
+      COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}/${pyfile}"
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       DEPENDS ${PY_FILES}
     )
