Ease version handling and folder layout (#112)

* Handle version by cmake/ad-rss-lib-version.cmake
* Replace generated cmake files
* Remove impl folder
* Update map to latest v2.4.5_hotfix commit
* Update version number to 4.4.2

ad_rss/CMakeLists.txt

@@ -1,15 +1,14 @@
 # ----------------- BEGIN LICENSE BLOCK ---------------------------------
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 #
 # ----------------- END LICENSE BLOCK -----------------------------------
 cmake_minimum_required(VERSION 3.5)
 
-project(ad_rss)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/impl")
+include(../cmake/ad-rss-lib-version.cmake)
+project(ad_rss VERSION ${AD-RSS-LIB_VERSION})
 
 include(../cmake/compile-options.cmake)
 include(../cmake/hardening.cmake)
@@ -21,8 +20,115 @@ include(../cmake/python-binding.cmake)
 #convert list to string
 string (REPLACE ";" " " TARGET_LINK_FLAGS "${TARGET_LINK_OPTIONS}")
 
-add_subdirectory(generated)
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+set(ad_rss_TARGET_INCLUDE_DIRECTORIES)
+set(ad_rss_TARGET_LINK_LIBRARIES)
+
+find_package(Boost REQUIRED)
+list(APPEND ad_rss_TARGET_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
+list(APPEND ad_rss_TARGET_LINK_LIBRARIES ${Boost_LIBRARIES})
+
+find_package(ad_physics ${CARLA-MAP_VERSION} REQUIRED CONFIG)
+find_package(spdlog REQUIRED CONFIG)
+
+include(generated/ad_rss.cmake)
+
+add_library(${PROJECT_NAME}
+  ${ad_rss_GENERATED_SOURCES}
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/RssCheck.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/RssResponseResolving.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/RssSituationChecking.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/RssSituationExtraction.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/situation/Physics.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/situation/RssFormulas.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/situation/RssStructuredSceneIntersectionChecker.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/situation/RssStructuredSceneNonIntersectionChecker.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/situation/RssUnstructuredSceneChecker.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/world/RssSituationCoordinateSystemConversion.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/world/RssSituationIdProvider.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/world/RssObjectPositionExtractor.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unstructured/Geometry.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unstructured/TrajectoryCommon.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unstructured/TrajectoryPedestrian.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/unstructured/TrajectoryVehicle.cpp
+)
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS})
+target_compile_options(${PROJECT_NAME} PRIVATE ${TARGET_COMPILE_OPTIONS})
+set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${TARGET_LINK_FLAGS})
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_NAME}/Version.hpp)
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/generated/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  ${ad_rss_TARGET_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(${PROJECT_NAME} PUBLIC
+  ad_physics
+  spdlog::spdlog
+  PRIVATE
+  ${ad_rss_TARGET_LINK_LIBRARIES}
+)
+
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/generated/include/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+)
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
+)
+
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}_EXPORT
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+install(EXPORT ${PROJECT_NAME}_EXPORT
+  FILE ${PROJECT_NAME}Targets.cmake
+  DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/install/${PROJECT_NAME}Config.cmake
+  INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+)
+
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/install/${PROJECT_NAME}ConfigVersion.cmake
+  COMPATIBILITY SameMajorVersion
+)
+
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/install/${PROJECT_NAME}Config.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/install/${PROJECT_NAME}ConfigVersion.cmake
+  DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+)
+
+#####################################################################
+# Tests
+#####################################################################
+if (BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
 
+#####################################################################
+# Python binding
+#####################################################################
 if(BUILD_PYTHON_BINDING)
   add_subdirectory(python)
 endif()

ad_rss/generated/cmake/Config.cmake.in → ad_rss/cmake/Config.cmake.in

@@ -1,7 +1,7 @@
 ##
 # ----------------- BEGIN LICENSE BLOCK ---------------------------------
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 #
@@ -21,7 +21,7 @@ find_package(Boost REQUIRED)
 list(APPEND INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
 list(APPEND LIBRARIES ${Boost_LIBRARIES})
 
-find_dependency(ad_physics 2.3.0)
+find_dependency(ad_physics @CARLA-MAP_VERSION@)
 find_dependency(spdlog)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")

ad_rss/generated/include/ad_rss/Version.hpp → ad_rss/cmake/Version.hpp.in

@@ -1,7 +1,7 @@
 /*
  * ----------------- BEGIN LICENSE BLOCK ---------------------------------
  *
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: LGPL-2.1-only
  *
@@ -20,19 +20,19 @@
 /*!
  * The major version of ad_rss
  */
-#define AD_RSS_VERSION_MAJOR 4
+#define AD_RSS_VERSION_MAJOR @AD-RSS-LIB_VERSION_MAJOR@
 
 /*!
  * The minor version of ad_rss
  */
-#define AD_RSS_VERSION_MINOR 4
+#define AD_RSS_VERSION_MINOR @AD-RSS-LIB_VERSION_MINOR@
 
 /*!
  * The revision of ad_rss
  */
-#define AD_RSS_VERSION_REVISION 0
+#define AD_RSS_VERSION_REVISION @AD-RSS-LIB_VERSION_REVISION@
 
 /*!
  * The version of ad_rss as string
  */
-#define AD_RSS_VERSION_STRING "4.4.0"
+#define AD_RSS_VERSION_STRING "@AD-RSS-LIB_VERSION_MAJOR@.@AD-RSS-LIB_VERSION_MINOR@.@AD-RSS-LIB_VERSION_REVISION@"

ad_rss/generated/ad_rss.cmake

@@ -0,0 +1,27 @@
+##
+# ----------------- BEGIN LICENSE BLOCK ---------------------------------
+#
+# Copyright (C) 2018-2021 Intel Corporation
+#
+# SPDX-License-Identifier: LGPL-2.1-only
+#
+# ----------------- END LICENSE BLOCK -----------------------------------
+##
+##
+# Generated file
+#
+# Generator Version : 11.0.0-1997
+##
+
+set(ad_rss_GENERATED_SOURCES
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/situation/LateralRelativePosition.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/situation/LongitudinalRelativePosition.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/situation/SituationType.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/state/LateralResponse.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/state/LongitudinalResponse.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/state/RssStateEvaluator.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/state/UnstructuredSceneResponse.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/world/LaneDrivingDirection.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/world/LaneSegmentType.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/src/ad/rss/world/ObjectType.cpp
+)