fixing compilation of tests

traversaro · Apr 19, 2018 · fd21426 · fd21426
1 parent ee91c11
commit fd21426
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 /CMakeLists.txt.user
+build*
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,15 @@ matrix:
 
 before_install:
   - sudo apt-get update && sudo apt-get --reinstall install -qq build-essential
+# see motivation here https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/
+  - sudo apt-get --reinstall install -qq libgtest-dev cmake
+  - cd /usr/src/gtest
+  - sudo cmake CMakeLists.txt
+  - sudo make
+  - sudo cp *.a /usr/lib
+
+# copy or symlink libgtest.a and libgtest_main.a to your /usr/lib folder
+sudo cp *.a /usr/lib
 
 install:
   - if [ "$ROS_DISTRO" != "none" ]; then git clone https://github.com/ros-industrial/industrial_ci.git .ci_config; fi

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(behavior_tree_core)
 
 set(CMAKE_BUILD_TYPE Release)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Werror=return-type")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -pthread -Werror=return-type")
 
 #############################################################
 # http://answers.ros.org/question/230877/optionally-build-a-package-with-catkin/