Commit 54573e0c authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Merge branch 'develop' into 'main' 

Correction of many fixes

See merge request !6
parents 6d06b772 71240517

.gitignore

+5 −2
Original line number Diff line number Diff line
@@ -13,5 +13,8 @@ node_modules 
.vscode

*/build/*

EtsiServerGen/*

!*/CMakeLists.txt

!*/.openapi-generator-ignore
 
!EtsiServerGen/CMakeLists.txt

!EtsiServerGen/.openapi-generator-ignore

!EtsiServerGen/patches

!EtsiServerGen/conanfile.txt

EtsiServerImpl/CMakeUserPresets.json
 
 No newline at end of file

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "arf005"]

	path = arf005

	url = https://forge.etsi.org/rep/arf/arf005.git
 
	url = https://forge.etsi.org/rep/arf/openapi.git

EtsiServerGen/.openapi-generator-ignore

+2 −0
Original line number Diff line number Diff line
@@ -23,3 +23,5 @@ 
#!docs/README.md



CMakeLists.txt

patches

conanfile.txt

EtsiServerGen/CMakeLists.txt

+45 −23
Original line number Diff line number Diff line 
#

# ARF - Augmented Reality Framework (ETSI ISG ARF)

#

# Copyright 2022 ETSI

# Copyright 2024 ETSI

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -15,44 +15,66 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.

#

# Last change: June 2022

# Last change: May 2024

#



cmake_minimum_required (VERSION 3.2)

cmake_minimum_required(VERSION 3.23)



project(PistacheGen)

project(worldStorageRestBedcppServer VERSION 2.1.0)



set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pg -g3" )

set(CMAKE_POSITION_INDEPENDENT_CODE ON)



include(ExternalProject)

set(TARGET_NAME worldStorageRestBedcppServer)



set(EXTERNAL_INSTALL_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/external)

find_package(Boost REQUIRED)

find_package(restbed  REQUIRED)



find_package(PkgConfig)

pkg_check_modules(PISTACHE REQUIRED libpistache)

# Get generated filenames

file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/.openapi-generator/FILES" GENERATED_SOURCES)

list(FILTER GENERATED_SOURCES INCLUDE REGEX ".*cpp$")



include_directories(${EXTERNAL_INSTALL_LOCATION}/include)

link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)



include_directories(model)

include_directories(api)

include_directories(impl)



set(GENERATED_SOURCES_INCLUDE_DIRS

    ${CMAKE_CURRENT_LIST_DIR}/model

    ${CMAKE_CURRENT_LIST_DIR}/api

    ${CMAKE_CURRENT_LIST_DIR}

)



file(GLOB SRCS

    ${CMAKE_CURRENT_SOURCE_DIR}/api/*.cpp

    ${CMAKE_CURRENT_SOURCE_DIR}/impl/*.cpp

    ${CMAKE_CURRENT_SOURCE_DIR}/model/*.cpp

    ${CMAKE_CURRENT_SOURCE_DIR}/model/nlohamnn/*.cpp

    ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp

    ${CMAKE_CURRENT_SOURCE_DIR}/api/*.cpp

)



file(GLOB HDRS

    ${CMAKE_CURRENT_SOURCE_DIR}/api/*.h

    ${CMAKE_CURRENT_SOURCE_DIR}/model/*.h

    ${CMAKE_CURRENT_SOURCE_DIR}/api/*.h

)



include_directories(

    ${CMAKE_CURRENT_SOURCE_DIR}/model

    ${CMAKE_CURRENT_SOURCE_DIR}/api

)



add_library(${PROJECT_NAME} ${SRCS} )

target_link_libraries(${PROJECT_NAME} pistache pthread)

add_library(${TARGET_NAME} STATIC)



target_sources(${TARGET_NAME}

    PRIVATE

        ${GENERATED_SOURCES})



target_include_directories(${TARGET_NAME}

    PUBLIC

        ${GENERATED_SOURCES_INCLUDE_DIRS}

)



target_link_libraries(${TARGET_NAME}

    PUBLIC

    boost::boost

    restbed::restbed

    -lpthread

    )



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

install(TARGETS ${TARGET_NAME} DESTINATION lib)



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

install(FILES ${HDRS} DESTINATION include)

EtsiServerGen/conanfile.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
[requires]

boost/1.84.0

restbed/4.8



[generators]

CMakeDeps

CMakeToolchain



[layout]

cmake_layout



[options]