Commit ecc6b76a authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'CMakeFix' into 'master'

Updated EMAM2CPP version for CMake fix; Link to Linux armadillo zip

See merge request !19
parents 2286eaeb bd8a47d9
Pipeline #80575 passed with stage
in 6 minutes and 37 seconds
......@@ -19,7 +19,7 @@ Example install of all needed packages for ubuntu:
```bash
sudo apt install gcc cmake make
```
Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.06.20-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.10.24-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
To check everything is installed correctly use whereis/ls:
```bash
......
......@@ -9,7 +9,7 @@
<groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-math-middleware-generator</artifactId>
<version>0.0.8-SNAPSHOT</version>
<version>0.0.9-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
......@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<se-commons.version>1.7.7</se-commons.version>
<Embedded-montiarc-math-generator.version>0.0.25-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-generator.version>0.0.26-SNAPSHOT</Embedded-montiarc-math-generator.version>
<Embedded-montiarc-math-roscpp-generator.version>0.0.4-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
<Embedded-montiarc-math-rosmsg-generator.version>0.0.3-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
<EMADL.version>0.2.2-SNAPSHOT</EMADL.version>
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(tests_a_addComp tests_a_addComp.h)
target_include_directories(tests_a_addComp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(tests_a_addComp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(tests_a_addComp PUBLIC ${LIBS})
set_target_properties(tests_a_addComp PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_collisionDetection ba_system_collisionDetection.h)
target_include_directories(ba_system_collisionDetection PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_collisionDetection PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_collisionDetection PUBLIC ${LIBS})
set_target_properties(ba_system_collisionDetection PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_intersectionController ba_system_intersectionController.h)
target_include_directories(ba_system_intersectionController PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_intersectionController PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_intersectionController PUBLIC ${LIBS})
set_target_properties(ba_system_intersectionController PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_stopCommQuality_1_ ba_system_stopCommQuality_1_.h)
target_include_directories(ba_system_stopCommQuality_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_stopCommQuality_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_stopCommQuality_1_ PUBLIC ${LIBS})
set_target_properties(ba_system_stopCommQuality_1_ PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_stopCommQuality_2_ ba_system_stopCommQuality_2_.h)
target_include_directories(ba_system_stopCommQuality_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_stopCommQuality_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_stopCommQuality_2_ PUBLIC ${LIBS})
set_target_properties(ba_system_stopCommQuality_2_ PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_velocityController_1_ ba_system_velocityController_1_.h)
target_include_directories(ba_system_velocityController_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_velocityController_1_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_velocityController_1_ PUBLIC ${LIBS})
set_target_properties(ba_system_velocityController_1_ PROPERTIES LINKER_LANGUAGE CXX)
......
......@@ -16,7 +16,7 @@ set(LIBS ${LIBS} ${Armadillo_LIBRARIES})
# create static library
include_directories(${INCLUDE_DIRS})
add_library(ba_system_velocityController_2_ ba_system_velocityController_2_.h)
target_include_directories(ba_system_velocityController_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(ba_system_velocityController_2_ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIRS})
target_link_libraries(ba_system_velocityController_2_ PUBLIC ${LIBS})
set_target_properties(ba_system_velocityController_2_ PROPERTIES LINKER_LANGUAGE CXX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment