Commit 9f40d0a6 authored by Reinhard Biegel's avatar Reinhard Biegel
Browse files

Merge branch 'update-opsimulation' into 'develop' 

Fix doxygen comments, line endings

See merge request !248
parents fedd367a 74b5845f

.gitattributes

+0 −1
Original line number Diff line number Diff line 
* text=auto

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ doc/source/api.rst 
# third party references

deps/*

sim/deps/*

deps/*



# clangd cache

.cache

Doxyfile

+2 −23
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ WARN_LOGFILE = "DoxygenWarningLog.txt" 


INPUT                  =  \

                          sim/src \

                          $(OP_DEPS_DIR)/direct_deploy/mantleapi/include \

                          sim/include \



# This tag can be used to specify the character encoding of the source files
@@ -957,27 +958,6 @@ RECURSIVE = YES 
EXCLUDE                = \

                         sim/deps/thirdParty \

                         sim/src/core/opSimulation/modules/World_OSI/OWL/fakes \

                         \

                         sim/src/core/opSimulation/framework/vehicle.h \

                         sim/src/core/opSimulation/framework/pedestrian.h \

                         sim/src/core/opSimulation/framework/environment.h \

                         sim/src/core/opSimulation/framework/entity.h \

                         sim/src/core/opSimulation/framework/entityRepository.h \

                         sim/src/core/opSimulation/framework/controller.h \

                         sim/src/core/opSimulation/framework/controllerRepository.h \

                         sim/src/core/opSimulation/framework/coordConverter.h \

                         sim/src/core/opSimulation/framework/geometryHelper.h \

                         sim/src/core/opSimulation/framework/geometryHelper.cpp \

                         sim/src/core/opSimulation/framework/laneLocationQueryService.h \

                         sim/src/core/opSimulation/framework/laneLocationQueryService.cpp \

                         sim/src/core/opSimulation/framework/logger.h \

                         sim/src/core/opSimulation/framework/trafficSwarmService.h \

                         sim/src/core/opSimulation/framework/vehicle.cpp \

                         sim/src/core/opSimulation/framework/pedestrian.cpp \

                         sim/src/core/opSimulation/framework/environment.cpp \

                         sim/src/core/opSimulation/framework/entity.cpp \

                         sim/src/core/opSimulation/framework/entityRepository.cpp \

                         sim/src/core/opSimulation/framework/controllerRepository.cpp \



# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or

# directories that are symbolic links (a Unix file system feature) are excluded
@@ -2310,7 +2290,6 @@ PREDEFINED = \ 
    SENSOR_DRIVER_SHARED_EXPORT=, \

    SENSOR_FUSION_SHARED_EXPORT=, \

    SENSOR_OSI_SHARED_EXPORT=, \

    SENSOR_RECORD_STATE_SHARED_EXPORT=, \

    SIGNAL_PRIORITIZER_SHARED_EXPORT=, \

    SPAWNPOINT_SHARED_EXPORT=, \

    STOCHASTICS_SHARED_EXPORT=, \

cmake/global.cmake

+7 −4
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ option(INSTALL_SYSTEM_RUNTIME_DEPS "Copy detected system runtime dependencies to 
option(INSTALL_EXTRA_RUNTIME_DEPS "Copy detected third party runtime dependencies to install directory (i.e. required shared libraries found in specified CMAKE_PREFIX_PATH)" OFF)

option(INSTALL_EXAMPLES "Install configuration examples" ON)



option(WITH_ADDRESS_SANITIZER "Build with AddressSanitizer" OFF)

option(WITH_MEMORY_SANITIZER "Build with MemorySanitizer" OFF)



set(CMAKE_EXPORT_COMPILE_COMMANDS ON)



# NOTE: undocumented feature of cmake
@@ -57,8 +60,8 @@ if(USE_CCACHE) 
endif()



if(NOT WIN32 OR (WIN32 AND CMAKE_CROSSCOMPILING))

  set(CMAKE_C_FLAGS_DEBUG "-g -O0")

  set(CMAKE_CXX_FLAGS_DEBUG "-g -g -O0")

  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -O0")

  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")

endif()



if(MINGW)
@@ -88,11 +91,11 @@ if(WITH_SIMCORE OR WITH_TESTS) 
  find_package(Open-simulation-interface REQUIRED)



  set(Boost_USE_STATIC_LIBS OFF)

  find_package(Boost COMPONENTS filesystem program_options REQUIRED CONFIG)

  find_package(Boost 1.85.0 COMPONENTS Headers filesystem program_options REQUIRED CONFIG)

  find_package(Qt5 COMPONENTS Concurrent Core Widgets Xml XmlPatterns Test REQUIRED)

  find_package(Iconv REQUIRED)

  set(LIBXML2_WITH_ICONV ON)

  find_package(LibXml2 REQUIRED)

  find_package(LibXml2 REQUIRED CONFIG)

  find_package(FMILibrary)



  if(WITH_PROTOBUF_ARENA)

cmake/install_deps.cmake

+5 −1
Original line number Diff line number Diff line
@@ -78,11 +78,15 @@ install(CODE 
  "

  message(STATUS \"Resolving runtime dependencies...\")



  if(EXE_TARGET_LIST)

    set(EXE_TARGET_LIST_ARG \"EXECUTABLES \${EXE_TARGET_LIST}\")

  endif()



  file(GET_RUNTIME_DEPENDENCIES

       RESOLVED_DEPENDENCIES_VAR resolved_deps

       UNRESOLVED_DEPENDENCIES_VAR unresolved_deps

       DIRECTORIES ${RT_LIB_DIRS}

       EXECUTABLES ${EXE_TARGET_LIST}

       ${EXE_TARGET_LIST_ARG}

       LIBRARIES ${LIB_TARGET_LIST}

       POST_EXCLUDE_REGEXES \"^${CMAKE_BINARY_DIR}\"

       )

Copyright © Eclipse Foundation AISBL. All rights reserved.     Privacy Policy | Terms of Use | Copyright Agent