OBS-6: made target names unique by appending their package_name, so we can use...

OBS-6: made target names unique by appending their package_name, so we can use the cmake function npm_install for multiple packages simultaneously

CMake/NPMInstall.cmake

@@ -68,10 +68,10 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
     
     get_filename_component(NPM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" REALPATH)
     
-    add_custom_target(copy_src_public SOURCES  ${NPM_BINARY_DIR}/public  ${NPM_BINARY_DIR}/src)
-    add_custom_target(copy_package_json SOURCES "${NPM_BINARY_DIR}/package.json")
-    add_custom_target(download_npm_dependencies SOURCES "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" DEPENDS copy_src_public copy_package_json)
-    add_custom_target(packing_javascript_files ALL SOURCES ${NPM_BINARY_DIR}/build)
+    add_custom_target(copy_src_public_${PACKAGE_NAME} SOURCES  ${NPM_BINARY_DIR}/public  ${NPM_BINARY_DIR}/src)
+    add_custom_target(copy_package_json_${PACKAGE_NAME} SOURCES "${NPM_BINARY_DIR}/package.json")
+    add_custom_target(download_npm_dependencies_${PACKAGE_NAME} SOURCES "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" DEPENDS copy_src_public_${PACKAGE_NAME} copy_package_json_${PACKAGE_NAME})
+    add_custom_target(packing_javascript_files_${PACKAGE_NAME} ALL SOURCES ${NPM_BINARY_DIR}/build)
     add_custom_target(start_development_server_${PACKAGE_NAME} SOURCES "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json" "${NPM_BINARY_DIR}/package.json"
                                                                COMMENT "Start start_development_server for ${PACKAGE_NAME}")
     
@@ -80,19 +80,19 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
       ${JSON_PACKAGE_SPECIFICATION} ${NPM_BINARY_DIR}/package.json
     DEPENDS ${JSON_PACKAGE_SPECIFICATION}
-    COMMENT "Copying package.json")
+    COMMENT "Copying ${JSON_PACKAGE_SPECIFICATION} to ${NPM_BINARY_DIR}/package.json for ${PACKAGE_NAME}")
     
     add_custom_command(
     OUTPUT "${NPM_BINARY_DIR}/src"
     COMMAND ${CMAKE_COMMAND} -E copy_directory
       ${WEBSITE_SOURCE_DIR} ${NPM_BINARY_DIR}/src
-    COMMENT "Copying javascript src directory")
+    COMMENT "Copying javascript src directory from ${WEBSITE_SOURCE_DIR} to ${NPM_BINARY_DIR}/src for ${PACKAGE_NAME}")
     
     add_custom_command(
     OUTPUT "${NPM_BINARY_DIR}/public"
     COMMAND ${CMAKE_COMMAND} -E copy_directory
       ${WEBSITE_PUBLIC_DIR} ${NPM_BINARY_DIR}/public
-    COMMENT "Copying public directory")
+    COMMENT "Copying public directory ${WEBSITE_PUBLIC_DIR} to ${NPM_BINARY_DIR}/public for ${PACKAGE_NAME}")
     
     add_custom_command(
     OUTPUT "${NPM_BINARY_DIR}/node_modules" "${NPM_BINARY_DIR}/package-lock.json"
@@ -105,15 +105,13 @@ function(npm_install NPM_PACKAGE_SPECIFICATION)
     TARGET start_development_server_${PACKAGE_NAME}
     COMMAND npm start
     WORKING_DIRECTORY ${NPM_BINARY_DIR}
-    COMMENT "Starting development server")
+    COMMENT "Starting development server for ${PACKAGE_NAME}")
     
     add_custom_command(
     OUTPUT "${NPM_BINARY_DIR}/build"
     COMMAND npm run build
-    DEPENDS copy_src_public download_npm_dependencies
-    COMMENT "Packing javascript files for deploy")
-    
-    message(${NPM_INSTALL_DESTINATION})
+    DEPENDS copy_src_public_${PACKAGE_NAME} download_npm_dependencies_${PACKAGE_NAME}
+    COMMENT "Packing javascript files for ${PACKAGE_NAME} into ${NPM_BINARY_DIR}/build for deployment")
     
     install(DIRECTORY ${NPM_BINARY_DIR}/build/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${NPM_INSTALL_DESTINATION})