Commit bc6c9a88 authored by Nathan Chambron's avatar Nathan Chambron
Browse files

Merge branch 'develop' into 'feature/newApiSpecs' 

# Conflicts:
#   EtsiServerGen/CMakeLists.txt
parents c1c913f6 2f9558de

EtsiServerGen/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,5 +34,5 @@ file(GLOB HDRS 
add_library(${PROJECT_NAME} ${SRCS} )

target_link_libraries(${PROJECT_NAME} pistache pthread)



install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local)

install(FILES ${HDRS} DESTINATION include)
 
install(TARGETS ${PROJECT_NAME} DESTINATION /usr/lib/worldStorage)

install(FILES ${HDRS} DESTINATION include/worldStorage)

package-lock.json

+3 −3
Original line number Diff line number Diff line
@@ -370,9 +370,9 @@ 
      }

    },

    "follow-redirects": {

      "version": "1.14.7",

      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",

      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",

      "version": "1.14.9",

      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",

      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",

      "dev": true

    },

    "fs-extra": {