Permalink
Browse files

* Cleaning up ODVD files

Signed-off-by: Christian Berger <christian.berger@gu.se>
  • Loading branch information...
chrberger committed Feb 18, 2017
1 parent f96ce0f commit 54bf016dc1e94780afaf8a41f7726833bcf86d93
View
@@ -84,6 +84,8 @@ IF( NOT("${CMAKE_C_COMPILER}" STREQUAL "")
MESSAGE(STATUS "Found C++ compiler: Building ODVDAutomotiveData")
SET(BUILD_ODVDAUTOMOTIVEDATA 1)
MESSAGE(STATUS "Found C++ compiler: Building ODVDCaroloCup")
SET(BUILD_ODVDCAROLOCUP 1)
MESSAGE(STATUS "Found C++ compiler: Building ODVDCommaAI")
SET(BUILD_ODVDCOMMAAI 1)
MESSAGE(STATUS "Found C++ compiler: Building ODVDOpenDLV")
@@ -294,7 +296,7 @@ IF(${BUILD_ODVDAUTOMOTIVEDATA})
ExternalProject_Add (libodvdautomotivedata
DEPENDS libodvdautomotivedata-cleanup
DOWNLOAD_COMMAND ""
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/ODVDAutomotiveData.odvd
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/resources/odvd/ODVDAutomotiveData.odvd
PATCH_COMMAND ""
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libodvdautomotivedata"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
@@ -305,6 +307,34 @@ IF(${BUILD_ODVDAUTOMOTIVEDATA})
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/libodvdautomotivedata-prefix/src/libodvdautomotivedata-build --target install COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/libodvdautomotivedata-prefix/src/libodvdautomotivedata-build --target ${MAKE_PACKAGE})
ENDIF()
# Next, the project for the AutomotiveData data structures is built.
IF(${BUILD_ODVDCAROLOCUP})
# This "external project" simply deletes the existing libodvdcarolocup.
ExternalProject_Add (libodvdcarolocup-cleanup
DEPENDS libopendavinci
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/libodvdcarolocup
PATCH_COMMAND ""
SOURCE_DIR ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
TEST_COMMAND ""
INSTALL_COMMAND "")
ExternalProject_Add (libodvdcarolocup
DEPENDS libodvdcarolocup-cleanup
DOWNLOAD_COMMAND ""
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/resources/odvd/ODVDCaroloCup.odvd
PATCH_COMMAND ""
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libodvdcarolocup"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE}"
CMAKE_ARGS "-DCXXTEST_INCLUDE_DIR=${CXXTEST_INCLUDE_DIR}"
TEST_BEFORE_INSTALL 1
TEST_COMMAND ${CMAKE_CTEST_COMMAND} ${CTEST_PARAMETERS}
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/libodvdcarolocup-prefix/src/libodvdcarolocup-build --target install COMMAND ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/libodvdcarolocup-prefix/src/libodvdcarolocup-build --target ${MAKE_PACKAGE})
ENDIF()
# Next, the project for the CommaAI data structures is built.
IF(${BUILD_ODVDCOMMAAI})
# This "external project" simply deletes the existing libodvdcommaai.
@@ -322,7 +352,7 @@ IF(${BUILD_ODVDCOMMAAI})
ExternalProject_Add (libodvdcommaai
DEPENDS libodvdcommaai-cleanup
DOWNLOAD_COMMAND ""
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/ODVDCommaAI.odvd
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/resources/odvd/ODVDCommaAI.odvd
PATCH_COMMAND ""
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libodvdcommaai"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
@@ -350,7 +380,7 @@ IF(${BUILD_ODVDOPENDLV})
ExternalProject_Add (libodvdopendlv
DEPENDS libodvdopendlv-cleanup
DOWNLOAD_COMMAND ""
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/ODVDOpenDLV.odvd
UPDATE_COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ${Java_JAVA_EXECUTABLE} -jar ${ODDATASTRUCTUREGENERATOR_EXECUTABLE} --withCMake ${CMAKE_CURRENT_SOURCE_DIR}/resources/odvd/ODVDOpenDLV.odvd
PATCH_COMMAND ""
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libodvdopendlv"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
View
@@ -39,10 +39,8 @@ ENDIF()
###########################################################################
# Find curses to enable odlivefeed.
FIND_PACKAGE (Curses)
FIND_PACKAGE (DL)
FIND_PACKAGE (CPPexperimental)
IF(CURSES_FOUND AND DL_FOUND AND CPPEXPERIMENTAL_FOUND)
IF(CURSES_FOUND)
ADD_SUBDIRECTORY (odlivefeed)
ENDIF()
File renamed without changes.
@@ -19,8 +19,6 @@
///////////////////////////////////////////////////////////////////////////////
message automotive.VehicleData [id = 39] {
cartesian.Point2 position [id = 1];
cartesian.Point2 velocity [id = 2];
double heading [id = 3];
double absTraveledPath [id = 4];
double relTraveledPath [id = 5];
File renamed without changes.
File renamed without changes.

0 comments on commit 54bf016

Please sign in to comment.