Commit b82ae8ff authored by Hugo Kreber's avatar Hugo Kreber
Browse files

Merge branch 'develop' of... 

Merge branch 'develop' of https://labs.etsi.org/rep/arf/world-storage-api-helpers/world-storage-cpp-server into develop
parents 4e89dedb 3734fbf3

EtsiServerGen/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ include_directories( 
    ${CMAKE_CURRENT_SOURCE_DIR}/api

)



add_library(${TARGET_NAME} SHARED)

add_library(${TARGET_NAME} STATIC)



target_sources(${TARGET_NAME}

    PRIVATE

EtsiServerImpl/.vscode/c_cpp_properties.json

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{

    "configurations": [

        {

            "name": "Linux",

            "includePath": [

                "${workspaceFolder}/**",

                "${workspaceFolder}/src"

            ],

            "defines": [],

            "compilerPath": "/usr/bin/gcc",

            "cStandard": "gnu17",

            "cppStandard": "gnu++14",

            "intelliSenseMode": "linux-gcc-x64",

            "configurationProvider": "ms-vscode.cmake-tools"

        }

    ],

    "version": 4

}
 
 No newline at end of file

nlohmann/json.hpp

deleted100644 → 0
+0 −26750

File deleted.

Preview size limit exceeded, changes collapsed.