Merge branch 'equil_cosmetics' into 'dev'

Equil cosmetics + Equil CI

See merge request !221

ExampleProjects/MultiplePendulum/workR/CMakeLists.txt

@@ -184,13 +184,21 @@ if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
         get_filename_component(LIB_MBSYSC_LOAD_DIR ${LIB_MBSYSC_LOAD} DIRECTORY)
         get_filename_component(LIB_MBSYSC_UTILITIES_DIR ${LIB_MBSYSC_UTILITIES} DIRECTORY)
         get_filename_component(LIB_MBSYSC_REALTIME_DIR ${LIB_MBSYSC_REALTIME} DIRECTORY)
-
+        
+        get_filename_component(VERSION ${LIB_MBSYSC_LOAD_DIR} NAME) 
+        message(STATUS "built in ${VERSION} mode ")
+        
         # copy all the dll used for Windows
         # these dll files are copied in the Executable directory (Debug)
         file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
+        # these dll files are copied in the Executable directory (Release)
+        file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
 
     endif ( )
     

ExampleProjects/PendulumSpring123/workR/CMakeLists.txt

@@ -185,13 +185,21 @@ if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
         get_filename_component(LIB_MBSYSC_LOAD_DIR ${LIB_MBSYSC_LOAD} DIRECTORY)
         get_filename_component(LIB_MBSYSC_UTILITIES_DIR ${LIB_MBSYSC_UTILITIES} DIRECTORY)
         get_filename_component(LIB_MBSYSC_REALTIME_DIR ${LIB_MBSYSC_REALTIME} DIRECTORY)
-
+        
+        get_filename_component(VERSION ${LIB_MBSYSC_LOAD_DIR} NAME) 
+        message(STATUS "built in ${VERSION} mode ")
+        
         # copy all the dll used for Windows
         # these dll files are copied in the Executable directory (Debug)
         file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
+        # these dll files are copied in the Executable directory (Release)
+        file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
 
     endif ( )
 

ExampleProjects/PendulumSpringC/workR/CMakeLists.txt

@@ -185,13 +185,21 @@ if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
         get_filename_component(LIB_MBSYSC_LOAD_DIR ${LIB_MBSYSC_LOAD} DIRECTORY)
         get_filename_component(LIB_MBSYSC_UTILITIES_DIR ${LIB_MBSYSC_UTILITIES} DIRECTORY)
         get_filename_component(LIB_MBSYSC_REALTIME_DIR ${LIB_MBSYSC_REALTIME} DIRECTORY)
-
+        
+        get_filename_component(VERSION ${LIB_MBSYSC_LOAD_DIR} NAME) 
+        message(STATUS "built in ${VERSION} mode ")
+        
         # copy all the dll used for Windows
         # these dll files are copied in the Executable directory (Debug)
         file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
         file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Debug)
+        # these dll files are copied in the Executable directory (Release)
+        file(COPY ${LIB_MBSYSC_MODULES_DIR}\\MBsysC_module.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_LOAD_DIR}\\MBsysC_loadXML.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_UTILITIES_DIR}\\MBsysC_utilities.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
+        file(COPY ${LIB_MBSYSC_REALTIME_DIR}\\MBsysC_realtime.dll DESTINATION ${CMAKE_BINARY_DIR}\\Release)
 
     endif ( )
 

ExampleProjects/TutorialProjects/1_Bodies_and_Joints/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/2_Links/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/3_Cuts/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/4_Driven_variable/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/5_Sensors/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/5_Sensors/symbolicR/CMakeLists.txt

-#
-#   Universite catholique de Louvain
-#   CEREM : Centre for research in mechatronics
-#   http://www.robotran.be  
-#   Contact : info@robotran.be
-#
-#
-# CMake for compiling the symbolic files of a robotran project in C
-# 
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                       LIBRARY MAIN CONFIGURATIONS
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if (UNIX)
-    cmake_minimum_required(VERSION 2.8.7)
-else()
-    cmake_minimum_required(VERSION 3.4)
-endif ()
-
-project(Project_symbolic)
-
-# flags
-if (UNIX)
-    set(CMAKE_C_FLAGS "-fPIC")
-    set(CMAKE_EXE_LINKER_FLAGS "-fPIC")
-endif (UNIX)
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                        SEPARATE COMPILATION
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if ( FLAG_SEPARATE_SYMBOLIC )
-	set(CMAKE_AUX ${ROBOTRAN_SOURCE_DIR}/cmake_aux)
-	set(CMAKE_AUX_BIN ${PROJECT_BINARY_DIR}/cmake_aux)
-
-	add_subdirectory ( ${CMAKE_AUX}/flags/   ${CMAKE_AUX_BIN}/flags/   )
-	add_subdirectory ( ${CMAKE_AUX}/listing/ ${CMAKE_AUX_BIN}/listing/ )
-endif ( )
-
-# release of debug
-release_debug()
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         SET LIBRARY
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# list source files to compile
-init_src()
-increment_src( ${PROJECT_SOURCE_DIR} )
-increment_void_symbolic( ${PROJECT_SOURCE_DIR} )
-
-# list include directories (to find headers)
-init_include()
-increment_include( ${ROBOTRAN_SOURCE_DIR}/mbs_common )
-
-# include these directories
-include_directories ( ${INCLUDE_DIR} )
-include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
-
-if( FLAG_SHARED_LIB OR FLAG_SEPARATE_SYMBOLIC )
-
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    add_library(Project_symbolic SHARED ${SOURCE_FILES})
-    
-    # MacOS: Force extension to be .so rather than .dylib
-    if(APPLE)
-        set_target_properties(Project_symbolic PROPERTIES SUFFIX .so)    
-    endif()    
-
-    # Windows, copy dll next to executable
-    if((NOT UNIX) AND (NOT FLAG_SEPARATE_SYMBOLIC))
-        add_custom_command(TARGET Project_symbolic POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E copy
-                        ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/Project_symbolic.dll
-                        ${CMAKE_CURRENT_BINARY_DIR}/../$<CONFIGURATION>/Project_symbolic.dll
-        )
-    endif()
-
-else()
-    add_library(Project_symbolic STATIC ${SOURCE_FILES})
-
-    # some symbolic routines call user functions (ext_forces, accelred, ...)
-    target_link_libraries(Project_symbolic Project_userfct)
-endif()
-
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         LINK LIBRARIES
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# MBSysC libraries
-if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
-    find_package( LibRobotranC 1.11.0 REQUIRED )
-    add_definitions(${LIB_MBSYSC_DEFINITIONS})
-    target_link_libraries(Project_symbolic ${LIB_MBSYSC_MODULES})
-endif()
-
-# Windows M_PI definitions
-if (WIN32)
-    add_definitions(-D _USE_MATH_DEFINES)
-endif (WIN32)

ExampleProjects/TutorialProjects/5_Sensors/userfctR/CMakeLists.txt

-#
-#   Universite catholique de Louvain
-#   CEREM : Centre for research in mechatronics
-#   http://www.robotran.be  
-#   Contact : info@robotran.be
-#
-#
-# CMake for compiling the user files of a robotran project in C
-# 
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                       LIBRARY MAIN CONFIGURATIONS
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if (UNIX)
-    cmake_minimum_required(VERSION 2.8.7)
-else()
-    cmake_minimum_required(VERSION 3.4)
-endif ()
-
-project(Project_userfct)
-
-# flags
-if (UNIX)
-    set(CMAKE_C_FLAGS "-fPIC")
-    set(CMAKE_EXE_LINKER_FLAGS "-fPIC")
-endif (UNIX)
-
-# Windows M_PI definitions
-if (WIN32)
-    add_definitions(-D _USE_MATH_DEFINES)
-endif (WIN32)
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                        SEPARATE COMPILATION
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if ( FLAG_SEPARATE_USER_FCT )
-
-    # additional CMakeLists.txt
-    set(CMAKE_AUX ${ROBOTRAN_SOURCE_DIR}/cmake_aux)
-    set(CMAKE_AUX_BIN ${PROJECT_BINARY_DIR}/cmake_aux)
-
-    add_subdirectory ( ${CMAKE_AUX}/flags/   ${CMAKE_AUX_BIN}/flags/   )
-    add_subdirectory ( ${CMAKE_AUX}/listing/ ${CMAKE_AUX_BIN}/listing/ )
-    add_subdirectory ( ${CMAKE_AUX}/libraries/ ${CMAKE_AUX_BIN}/libraries/ )
-
-    # real-time option
-    option (FLAG_REAL_TIME "Real time" OFF)
-
-    if(FLAG_REAL_TIME)
-        add_definitions( -DREAL_TIME )
-
-        # configure a header file to pass some of the CMake settings to the source code
-        configure_file (
-            "${ROBOTRAN_SOURCE_DIR}/conf/cmake_config.h.in"
-            "${PROJECT_BINARY_DIR}/conf/cmake_config.h"
-        )
-        include_directories (${PROJECT_BINARY_DIR}/conf)
-
-        # plot-visu options
-        option (FLAG_PLOT "Real time" OFF)
-        option (FLAG_VISU "Real time" OFF)
-        option (FLAG_JAVA "Real time" OFF)
-        option (FLAG_OPEN_GL "Real time" OFF)
-
-        if(FLAG_PLOT)
-            add_definitions( -DSDL )
-        endif( )
-
-        if(FLAG_VISU)
-            add_definitions( -DVISU_3D )
-        endif( )
-
-        if(FLAG_JAVA)
-            add_definitions( -DJAVA )
-        endif( )
-
-        if(FLAG_OPEN_GL)
-            add_definitions( -DOPEN_GL )
-        endif( )
-
-    endif ( )
-endif ( )
-
-# release of debug
-release_debug()
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         SET LIBRARY
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# list source files to compile
-init_src()
-increment_src( ${PROJECT_SOURCE_DIR} )
-increment_void_user( ${PROJECT_SOURCE_DIR} )
-
-# list include directories (to find headers)
-init_include()
-increment_include( ${ROBOTRAN_SOURCE_DIR}/mbs_common )
-
-# include these directories
-include_directories ( ${INCLUDE_DIR} )
-include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
-
-if( FLAG_SHARED_LIB OR FLAG_SEPARATE_USER_FCT )
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    add_library(Project_userfct SHARED ${SOURCE_FILES})
-
-    target_link_libraries (Project_userfct ${LIB_MBSYSC_REALTIME})
-    target_link_libraries (Project_userfct ${LIB_MBSYSC_MODULES})
-    target_link_libraries (Project_userfct ${LIB_MBSYSC_UTILITIES})
-    
-    # MacOS: Force extension to be .so rather than .dylib
-    if(APPLE)
-        set_target_properties(Project_userfct PROPERTIES SUFFIX ".so")    
-    endif()
-
-    # Windows, copy dll next to executable
-    if((NOT UNIX) AND (NOT FLAG_SEPARATE_USER_FCT))
-        add_custom_command(TARGET Project_userfct POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy
-                ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/Project_userfct.dll
-                ${CMAKE_CURRENT_BINARY_DIR}/../$<CONFIGURATION>/Project_userfct.dll
-        )
-    endif()
-    
-else()
-    add_library(Project_userfct STATIC ${SOURCE_FILES})
-    target_link_libraries (Project_userfct ${LIB_MBSYSC_REALTIME} ${LIB_MBSYSC_UTILITIES})
-endif()
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         LINK LIBRARIES
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# MBSysC libraries
-if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
-    find_package( LibRobotranC 1.11.0 REQUIRED )
-    add_definitions(${LIB_MBSYSC_DEFINITIONS})
-endif()
-
-if (FLAG_PLOT)
-    sdl_header_lib(userfct)
-endif ( )

ExampleProjects/TutorialProjects/6_External_Force/resultsR/readme.md

-### resultsR folder
-
-This folder contains the results of the simulations or other computations.  
-This folder also contains the reference solution of the simulation.

ExampleProjects/TutorialProjects/6_External_Force/symbolicR/CMakeLists.txt

-#
-#   Universite catholique de Louvain
-#   CEREM : Centre for research in mechatronics
-#   http://www.robotran.be  
-#   Contact : info@robotran.be
-#
-#
-# CMake for compiling the symbolic files of a robotran project in C
-# 
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                       LIBRARY MAIN CONFIGURATIONS
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if (UNIX)
-    cmake_minimum_required(VERSION 2.8.7)
-else()
-    cmake_minimum_required(VERSION 3.4)
-endif ()
-
-project(Project_symbolic)
-
-# flags
-if (UNIX)
-    set(CMAKE_C_FLAGS "-fPIC")
-    set(CMAKE_EXE_LINKER_FLAGS "-fPIC")
-endif (UNIX)
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                        SEPARATE COMPILATION
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-if ( FLAG_SEPARATE_SYMBOLIC )
-	set(CMAKE_AUX ${ROBOTRAN_SOURCE_DIR}/cmake_aux)
-	set(CMAKE_AUX_BIN ${PROJECT_BINARY_DIR}/cmake_aux)
-
-	add_subdirectory ( ${CMAKE_AUX}/flags/   ${CMAKE_AUX_BIN}/flags/   )
-	add_subdirectory ( ${CMAKE_AUX}/listing/ ${CMAKE_AUX_BIN}/listing/ )
-endif ( )
-
-# release of debug
-release_debug()
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         SET LIBRARY
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# list source files to compile
-init_src()
-increment_src( ${PROJECT_SOURCE_DIR} )
-increment_void_symbolic( ${PROJECT_SOURCE_DIR} )
-
-# list include directories (to find headers)
-init_include()
-increment_include( ${ROBOTRAN_SOURCE_DIR}/mbs_common )
-
-# include these directories
-include_directories ( ${INCLUDE_DIR} )
-include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
-
-if( FLAG_SHARED_LIB OR FLAG_SEPARATE_SYMBOLIC )
-
-    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    add_library(Project_symbolic SHARED ${SOURCE_FILES})
-    
-    # MacOS: Force extension to be .so rather than .dylib
-    if(APPLE)
-        set_target_properties(Project_symbolic PROPERTIES SUFFIX .so)    
-    endif()    
-
-    # Windows, copy dll next to executable
-    if((NOT UNIX) AND (NOT FLAG_SEPARATE_SYMBOLIC))
-        add_custom_command(TARGET Project_symbolic POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E copy
-                        ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/Project_symbolic.dll
-                        ${CMAKE_CURRENT_BINARY_DIR}/../$<CONFIGURATION>/Project_symbolic.dll
-        )
-    endif()
-
-else()
-    add_library(Project_symbolic STATIC ${SOURCE_FILES})
-
-    # some symbolic routines call user functions (ext_forces, accelred, ...)
-    target_link_libraries(Project_symbolic Project_userfct)
-endif()
-
-
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-#                         LINK LIBRARIES
-# * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-# MBSysC libraries
-if ( FLAG_SEPARATE_BUILD ) # find MBSysC dynamic libraries
-    find_package( LibRobotranC 1.11.0 REQUIRED )
-    add_definitions(${LIB_MBSYSC_DEFINITIONS})
-    target_link_libraries(Project_symbolic ${LIB_MBSYSC_MODULES})
-endif()
-
-# Windows M_PI definitions
-if (WIN32)
-    add_definitions(-D _USE_MATH_DEFINES)
-endif (WIN32)

ExampleProjects/TutorialProjects/6_External_Force/userfctR/CMakeLists.txt

-#
-#   Universite catholique de Louvain
-#   CEREM : Centre for research in mechatronics
-#   http://www.robotran.be