Commit 19370715 authored by Sébastien Timmermans's avatar Sébastien Timmermans
Browse files

Merge branch 'dev' into 'smlk_invdyn'

# Conflicts:
#   CHANGELOG.md
#   MBsysC/mbs_common/mbs_load_xml/mbs_load_libraries.h
#   MBsysC/mbs_common/mbs_module/mbs_aux.c
#   MBsysC/tests/cross_compilation/Dockerfile
parents 87d9da55 dccd0e5c
......@@ -37,65 +37,6 @@ MBsysC_realtimeON:
expire_in: 2h
name: "Build_${CI_COMMIT_REF_NAME}"
InterfacePython :
image: immc/robotran-cross:v1.5
stage: build
before_script:
# Add ssh key
- 'which ssh-agent || ( apt update -y && apt install openssh-client -y)'
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
script :
# Builds MBsysPy and mbs_tgc
- mkdir MBsysC/build
- cd MBsysC/build
- cmake .. -DFLAG_INTERFACE_CTYPES=ON -DFLAG_TIREGROUNDCAR=ON
- make -j4
- mkdir python/MBsysPy/libs64/darwin python/MBsysPy/libs64/windows
- mkdir python/mbs_tgc/libs64/darwin python/mbs_tgc/libs64/windows
- cd ../mbs_interface/MBsysPy/doc
# - sphinx-apidoc -o source/ ../../ -f -e
#- make html
- cd ../../../..
- mkdir MBsysC/build-mingw
- cd MBsysC/build-mingw
- cmake .. -DCMAKE_TOOLCHAIN_FILE=/mingw64/cmake-mingw -DFLAG_INTERFACE_CTYPES=ON -DFLAG_TIREGROUNDCAR=ON
- make -j4
- cp /mingw64/bin/libxml2-2.dll /mingw64/bin/libopenblas.dll python/MBsysPy/libs64/windows/
- cp python/MBsysPy/libs64/windows/*.dll ../build/python/MBsysPy/libs64/windows
- cp python/mbs_tgc/libs64/windows/*.dll ../build/python/mbs_tgc/libs64/windows
- cd ../..
- mkdir MBsysC/build-osxcross
- cd MBsysC/build-osxcross
- $(osxcross-conf) && cmake .. -DCMAKE_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DFLAG_INTERFACE_CTYPES=ON -DFLAG_TIREGROUNDCAR=ON -DCMAKE_SHARED_LINKER_FLAGS="-framework Accelerate"
- make -j4
- cd python/MBsysPy/libs64/darwin
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_loadXML.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_realtime.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_module.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_realtime.dylib @loader_path/libMBsysC_realtime.dylib libMBsysC_module.dylib
- cd ../../../mbs_tgc/libs64/darwin
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/../../../MBsysPy/libs64/darwin/libMBsysC_utilities.dylib libAddon_TireGroundCar.dylib
- cd ../../../..
- cp python/MBsysPy/libs64/darwin/*.dylib ../build/python/MBsysPy/libs64/darwin
- cp python/mbs_tgc/libs64/darwin/*.dylib ../build/python/mbs_tgc/libs64/darwin
- cp python/MBsysPy/libs64/darwin/libMBsysC_utilities.dylib ../build/python/mbs_tgc/libs64/darwin
# Creating the packages
- cd ../build/python
- python3 setup_MBsysPy.py sdist bdist_wheel
- rm -r build
- python3 setup_mbs_tgc.py sdist bdist_wheel
- rm -r build
artifacts:
paths:
- MBsysC/build/python/dist/*
#- MBsysC/mbs_interface/MBsysPy/doc/_build/html/*
expire_in: 2d
name: "robotran-python-${CI_COMMIT_REF_NAME}"
# --------------------------------------------------------------------------
# Dev test Only
......@@ -135,13 +76,16 @@ coman_mbsysC:
stage: test_Dev
allow_failure: true
before_script:
- apt update
- apt install -y git
- apt-get update
- apt-get install -y git
- git submodule sync --recursive
- git stash
- git submodule update --init --recursive
script:
- mkdir ExampleProjects/coman_robot/workR/build
- cd ExampleProjects/coman_robot/workR/build
- cd /builds/robotran/mbsysc/MBsysC/build/bin
- ./Gen_mds_user "/builds/robotran/mbsysc/ExampleProjects/coman_robot/dataR/coman.mbs" "user_models"
- cd /builds/robotran/mbsysc/ExampleProjects/coman_robot/workR/build
- cmake -DROBOTRAN_SOURCE_DIR=$(pwd)/../../../../MBsysC -DFLAG_RELEASE=OFF ..
- make
- ./exe_projectRobotran
......@@ -149,6 +93,7 @@ coman_mbsysC:
- rm -r ExampleProjects/coman_robot/workR/build # need to manually clean folder for gitlab-ci with submodule
only:
- dev
# --------------------------------------------------------------------------
# Testing PendulumSpringC Example project
# --------------------------------------------------------------------------
......@@ -669,29 +614,137 @@ issue_170_User_Model:
- release_1.12.0
python-wheel-manylinux1:
image: immc/robotran-manylinux2010:v0.5
stage: build
script :
- mkdir MBsysC/build
- cd MBsysC/build
- cmake .. -DFLAG_INTERFACE_CTYPES=ON -DLIBXML2_INCLUDE_DIR=/linux/include/libxml2 -DLIBXML2_LIBRARIES=/linux/lib/libxml2.a -DLAPACK_LIBRARIES=/linux/lib/libopenblasp-r0-edd6b1a3.3.9.dev.so
- make -j4
- cp /linux/lib/libgfortran* /linux/lib/libopenblas* python/MBsysPy/libs64/linux
- cd python
- python3 setup_MBsysPy.py bdist_wheel --plat-name=manylinux1_x86_64
- rm -r build
artifacts:
paths:
- MBsysC/build/python/dist/*
expire_in: 2d
name: "robotran-python-manylinux1-${CI_COMMIT_REF_NAME}"
python-wheel-win64 :
image: immc/robotran-cross:v1.15
stage: build
script :
- mkdir MBsysC/build
- cd MBsysC/build
- cmake .. -DCMAKE_TOOLCHAIN_FILE=/mingw64/cmake-mingw -DFLAG_INTERFACE_CTYPES=ON -DLAPACK_LIBRARIES=/mingw64/bin/libopenblas.NOIJJG62EMASZI6NYURL6JBKM4EVBGM7.gfortran-win_amd64.dll
- make -j4
- cp /mingw64/bin/libxml2-2.dll /mingw64/bin/libopenblas.NOIJJG62EMASZI6NYURL6JBKM4EVBGM7.gfortran-win_amd64.dll python/MBsysPy/libs64/windows/
# Creating the packages
- cd python
- python3 setup_MBsysPy.py bdist_wheel --plat-name=win_amd64
- rm -r build
artifacts:
paths:
- MBsysC/build/python/dist/*
expire_in: 2d
name: "robotran-python-win-${CI_COMMIT_REF_NAME}"
python-wheel-macosx :
image: immc/robotran-cross:v1.11
stage: build
script :
- mkdir MBsysC/build
- cd MBsysC/build
- $(osxcross-conf) && cmake .. -DCMAKE_TOOLCHAIN_FILE=/osxcross/target/toolchain.cmake -DFLAG_INTERFACE_CTYPES=ON -DCMAKE_SHARED_LINKER_FLAGS="-framework Accelerate"
- make -j4
- cd python/MBsysPy/libs64/darwin
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_loadXML.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_realtime.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_utilities.dylib @loader_path/libMBsysC_utilities.dylib libMBsysC_module.dylib
- x86_64-apple-darwin19-install_name_tool -change libMBsysC_realtime.dylib @loader_path/libMBsysC_realtime.dylib libMBsysC_module.dylib
# Creating the packages
- cd ../../..
- python3 setup_MBsysPy.py bdist_wheel --plat-name=macosx_10_9_x86_64
- rm -r build
artifacts:
paths:
- MBsysC/build/python/dist/*
expire_in: 2d
name: "robotran-python-macosx${CI_COMMIT_REF_NAME}"
upload:
image: immc/robotran-cross:v1.11
stage: deploy
rules :
- if: '$CI_COMMIT_TAG =~ /^v.*$/'
when: always
before_script :
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- ssh-keyscan sftp.uclouvain.be >> ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- eval $(ssh-agent -s)
- echo "$WWWROBOTRAN_SSH_KEY" | tr -d '\r' | ssh-add -
script :
- echo 'put MBsysC/build/python/dist/* dist/mbsyspy/' | sftp wwwrobotran@sftp.uclouvain.be
doc:
image: immc/robotran-cross:v1.11
stage: build
script :
- mkdir MBsysC/build
- cd MBsysC/build
- cmake ..
- make
- cd ../..
- cd MBsysC/mbs_interface/MBsysPy/doc
- sphinx-apidoc -o source/ ../../ -f -e
- sphinx-apidoc -o source/ ../../MBsysPy/templates/user -f -e
- make html
artifacts:
paths:
- MBsysC/mbs_interface/MBsysPy/doc/_build/html/
expire_in: 2d
name: "robotran-python-doc-${CI_COMMIT_REF_NAME}"
# --------------------------------------------------------------------------
# Generating Doxygen documentation (directly available on Gitlab pages)
# --------------------------------------------------------------------------
pages:
image: alpine
image: immc/robotran-cross:v1.11
stage: deploy
# dependencies:
# - InterfacePython
dependencies:
- doc
script:
- apk update && apk add doxygen
- cd ./MBsysC/mbs_documentation/src
- doxygen Doxyfile
- cd ../../..
- mv ./MBsysC/mbs_documentation/html/ public/
#- mkdir public/MBsysPy
#- cp ./MBsysC/mbs_interface/MBsysPy/MBsysPy/doc/_build/html/ public/MBsysPy
- mkdir public
- mv ./MBsysC/mbs_documentation/html/ public/MBsysC
- cp -r ./MBsysC/mbs_interface/MBsysPy/doc/_build/html/ public/MBsysPy
- echo '<!DOCTYPE html> <html lang="en"> <head> <meta charset="utf-8"> <title>title</title> </head> <body> <a href="MBsysC"</a> MBsysC<br> <a href="MBsysPy"> MBsysPy</a><br> </body> </html>' > public/index.html
artifacts:
paths:
- public
only:
- master
#before_script:
# - eval $(ssh-agent -s)
# - mkdir -p ~/.ssh
# - chmod 700 ~/.ssh
# - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
# - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/key
# - chmod 600 ~/.ssh/key
# - ssh-add ~/.ssh/key
# --------------------------------------------------------------------------
# Old disable tests
# --------------------------------------------------------------------------
......
## Changes for next release
* To be defined
* **For user:**
* [C] All user models are printed with the `mbs_print_data` function
* [C] New function `print_d_vec_0_format` allowing to set the format of the vector values.
* [C] New function to compute matrix product between matrices of specified shape: `doublematrix_product_0`.
* [C] LPK functions new error catched with code `-#16`; Documentation fixed.
* [Py] User vector outputs are now available in the MbsDirdyn results field.
* [Py] Using C symbolic library and Python user is possible even with external forces.
* [Py] Adding missing fields in MbsData.
* [dirdyn][Fix] the function user_dirdyn_loop is now called only at the real time steps, even for multisteps integration methods.
* [integrators][dirdyn] Add a new integrator called 'AlphaM' for alpha method. It is explicit, fixed step-size but with two stages and a bit smarter than Euler explicit :-)
## Robotran v1.14.3
* [Python] Fix in MbsSensor class:
* bad call to `comp_s_sensor` in `comp_f_sensor` raising exception.
## Robotran v1.14.2
* [Python] Fixes in MbsSensor class:
* bad field called in `comp_f_sensor` raising exception.
* bad field called in `assign_to_C` raising exception when assigning an existing Python sensor to an existing C structure.
* with C symbolic libraries computing `force` or `gen` sensor was wrong as the class calls for the Python function.
* `gen_sensor` function is renamed to `comp_gen_sensor` (coherence with other sensors).
## Robotran v1.14.1
* [Python] Correct Python project templates in main.py (plot error) and user_ExtForces (index error)
* **Requires to upate template of existing projects in Python created with v 1.14.0**
* In user_extForces: replace `Swr[0:] = np.r_[Fx, Fy, Fz, Mx, My, Mz, dxF]` by `Swr[1:] = np.r_[Fx, Fy, Fz, Mx, My, Mz, dxF]`
* In main.py: remove `axis.set_xlim(left=mbs_dirdyn.t0, right=mbs_dirdyn.tf)` at the end of the file, in plotting section
* [C] Correct version number of examples
## Robotran v1.14.0
* **For user:**
* **Requires to generate again user files (and user file generation application)**
* **The ordering of `MbsData->lambda` has change. If you used them, update your files.**
* [Partitionning] Option `visualize` is used to generate failed loop closing procedure (default is no generation)
* [Partitioning] Option `visualize` is used to generate failed loop closing procedure (default is no generation)
* [Fix] Failing loop closing procedure was always trying to generate animation whatever was the option.
* [Fix] Missing functions in the template of user_model/IO
* [Fix] Lagrange multipliers (`MbsData->lambda`) are in the same order as the constraint definition.
......@@ -30,14 +58,46 @@
* [New] Changing user state ids is now forbidden.
* [Template] user_ExtForces documentation improved.
* [DEV] files updated to respect pep8 (except for E116, E126, E127, E402, E501, E722, E743, W503, W504)
* [DOC] files updated to respect numpydoc style (with spyder 4 lining)
* [DOC] files updated to respect numpydoc style (with spyder 4 lining)
* [Simulink] Inverse dynamics module added, basic use.
* [useful functions] two added :
* `pick_and_place_dvec_1 : dest[index[i]] = src[i];` (also exist for vec_0)
* `slct_dvec_1 : dest[i] = src[index[i]];` (previously only exist for vec_0)
*
* [ROS] compatibility with ROS in UNIX OS is done. Path to open GL process is put to catkin_ws.
Functions used in main are put as extern cpp to be compiled by ROS environment.
See the ROS tutorial on www.robotran.be for more informations
* [useful functions] two added :
* `pick_and_place_dvec_1` : dest[index[i]] = src[i]; (also exists for vec_0)
* `slct_dvec_1 : dest[i] = src[index[i]];` (previously only existed for vec_0)
* [Trajectories functions] :
A new set of trajectories functions is implemented, see `"mbs_trajectories.h"`
* [mbs_close_geo] a new field in mbs_aux has been added: n_iter_close_loop
This allows the user to know the number of iterations taken by the NR process during the loop closure procedure.
User can access it in user_dirdyn_loop for example, mbs_dirdyn->mbs_aux->n_iter_close_loop
* [integrators][dirdyn] add a flag to know when the jacobian is beeing computed with implicit integrators.
It can be used by the user in his functions to avoid unnecessary calculations during these steps. For example:
```c
if (!mbs_dd->options->flag_ongoing_jac_computation)
{
// do some stuff here that will only not be computed during the jacobian computation
}
```
The main purpose is to gain computation time.
* [integrators][dirdyn] add a flag to process a "Baumgarte" stabilization on the acceleration level:
`qdd = qdd - 2*alpha*qd - beta*beta*q`
alpha and beta are constant that should be adapted to each project.
Per default = NO Baumgarte stabilization
* [integrators][dirdyn] add a flag to compute the dfdx term in jacobian computation.
This allows to gain computation time if this term is not used in the integration process.
Per default, compute all the terms. For developpers only !
## Robotran v1.13.0
* [Python] A Python interface is available (MBsysPy)
* [Fix] The norm of the constraints errors were not correctly computed in some specific case (with user constraints and non-independent constraints)
......
......@@ -95,7 +95,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(${SYMBOLIC_LIB_NAME} ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -140,7 +140,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -175,7 +175,7 @@ flags_clean()
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_path(LibRobotranC_DIR LibRobotranCConfig.cmake "${ROBOTRAN_SOURCE_DIR}/build")
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
target_link_libraries( ${Executable} ${LIB_MBSYSC_MODULES} ${LIB_MBSYSC_LOAD} ${LIB_MBSYSC_UTILITIES} )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
......
......@@ -91,7 +91,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(Project_symbolic ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -136,7 +136,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -171,7 +171,7 @@ flags_clean()
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_path(LibRobotranC_DIR LibRobotranCConfig.cmake "${ROBOTRAN_SOURCE_DIR}/build")
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
target_link_libraries( ${Executable} ${LIB_MBSYSC_MODULES} ${LIB_MBSYSC_LOAD} ${LIB_MBSYSC_UTILITIES} )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
......
......@@ -91,7 +91,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(Project_symbolic ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -136,7 +136,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -175,7 +175,7 @@ flags_clean()
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_path(LibRobotranC_DIR LibRobotranCConfig.cmake "${ROBOTRAN_SOURCE_DIR}/build")
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
target_link_libraries( ${Executable} ${LIB_MBSYSC_MODULES} ${LIB_MBSYSC_LOAD} ${LIB_MBSYSC_UTILITIES} )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
......
......@@ -95,7 +95,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(${SYMBOLIC_LIB_NAME} ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -95,7 +95,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(${SYMBOLIC_LIB_NAME} ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -95,7 +95,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(${SYMBOLIC_LIB_NAME} ${LIB_MBSYSC_MODULES})
endif()
......
......@@ -140,7 +140,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -140,7 +140,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -140,7 +140,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
......@@ -172,7 +172,7 @@ flags_clean()
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_path(LibRobotranC_DIR LibRobotranCConfig.cmake "${ROBOTRAN_SOURCE_DIR}/build")
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
target_link_libraries( ${Executable} ${LIB_MBSYSC_MODULES} ${LIB_MBSYSC_LOAD} ${LIB_MBSYSC_UTILITIES} )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
......
......@@ -95,7 +95,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
target_link_libraries(${SYMBOLIC_LIB_NAME} ${LIB_MBSYSC_MODULES} ${LIB_MBSYSC_UTILITIES})
endif()
......
......@@ -140,7 +140,7 @@ endif()
# MBSysC libraries
if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
find_package( LibRobotranC 1.13.0 REQUIRED )
find_package( LibRobotranC 1.15.1 REQUIRED )
add_definitions(${LIB_MBSYSC_DEFINITIONS})
endif()
......
Supports Markdown
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