Merge pull request #21 from pariterre/master

move toward conda-forge

Author: pariterre

.travis.yml

@@ -5,13 +5,15 @@ matrix:
     dist: bionic
     compiler: gcc
     env:
-      - COMPILER=g++-5
+      - COMPILER=gcc
   - os: osx
     osx_image: xcode7.2
     compiler: gcc
     env:
-      - COMPILER=g++-7
+      - COMPILER=xcode7.2
   - os: windows
+    env:
+      - VS
 
 
 before_install:
@@ -36,13 +38,14 @@ before_install:
     - conda config --set auto_update_conda no
     - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then conda update -q conda; fi
     - source activate
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
+        sudo apt update;
+        sudo apt install gcc-6 g++-6 -y;
+      fi
 
 install:
-    # Install test packages for Python3
-    - conda install python pytest numpy swig
-    - conda install boost eigen
-    - conda install lapack -c conda-forge
-    - conda install dlib rbdl -cpyomeca
+    - conda install boost eigen rbdl dlib-cpp lapack numpy pytest swig -c conda-forge
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
         conda install lcov -c conda-forge;
       fi

example/CMakeLists.txt

@@ -5,10 +5,13 @@ add_dependencies(${PROJECT_NAME} ${MASTER_PROJECT_NAME})
 
 # Headers
 target_include_directories(${PROJECT_NAME} PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include
+    ${Matlab_INCLUDE_DIRS}
+    ${RBDL_INCLUDE_DIR}
+    ${RBDL_INCLUDE_DIR}/..
     ${Boost_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
-    ${RBDL_INCLUDE_DIR}
+    ${DLIB_INCLUDE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
 )
 
 # Libraries linker

example/main.cpp

@@ -19,7 +19,9 @@ int main()
     s2mMusculoSkeletalModel m3("pyomecaman.bioMod");
     s2mGenCoord Q(m3);
     s2mGenCoord QDDot(m3);
+    Q.setZero();
     s2mTau T(m3);
+    T.setZero();
 
     RigidBodyDynamics::ForwardDynamicsConstraintsDirect(m3, Q, Q, T, m3.getConstraints(m3),QDDot);// Forward dynamics
     int i = 0;

modules/FindDlib.cmake

@@ -15,7 +15,7 @@ find_path (DLIB_INCLUDE_DIR "dlib/algs.h"
 
 if(WIN32)
 	# For some reason find_library won't find dlib with only "dlib" name, it must have the full previously unknown name
-	FILE(GLOB LibPath ${CMAKE_INSTALL_PREFIX}/lib/dlib*)
+	FILE(GLOB LibPath ${CMAKE_INSTALL_PREFIX}/Library/lib/dlib*)
 	get_filename_component(LibNames ${LibPath} NAME)
 	find_library (DLIB_LIBRARY 
 			NAMES ${LibNames}

modules/FindRBDL.cmake

@@ -22,10 +22,14 @@ FIND_PATH (RBDL_INCLUDE_DIR rbdl.h
 	$ENV{RBDL_INCLUDE_PATH}
 	)
 FIND_LIBRARY (RBDL_LIBRARY NAMES rbdl	PATHS
-	/usr/lib
-	/usr/local/lib	
-	${CMAKE_INSTALL_PREFIX}
-	$ENV{HOME}/local/lib
+        /usr/lib
+        /usr/local/lib
+        /usr/local/lib64
+        ${CMAKE_INSTALL_PREFIX}
+        ${CMAKE_INSTALL_PREFIX}/lib
+        ${CMAKE_INSTALL_PREFIX}/lib64
+        $ENV{HOME}/local/lib
+        $ENV{HOME}/local/lib64
 	$ENV{RBDL_PATH}
 	$ENV{RBDL_LIBRARY_PATH}
 	)