Merge branch 'Ubuntu18.04' into statistics

CMakeModules/SimoxConfig.cmake.in

@@ -58,6 +58,7 @@ SET(SimDynamics_USE_BULLET_DOUBLE_PRECISION "@SimDynamics_USE_BULLET_DOUBLE_PREC
 
 
 FIND_PACKAGE(Qt5 5.5.0 COMPONENTS OpenGL Core Gui Widgets QUIET)
+FIND_PACKAGE(Boost COMPONENTS filesystem system program_options thread QUIET)
 
 
 

MotionPlanning/CMakeLists.txt

@@ -2,7 +2,7 @@ PROJECT ( Saba )
 
 MESSAGE (STATUS "***** CONFIGURING Simox project Saba *****")
 
-
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
 
 
 ########################### TESTING #####################################
@@ -12,7 +12,7 @@ MACRO(ADD_SABA_TEST TEST_NAME)
     if (NOT Boost_USE_STATIC_LIBS)
         target_compile_definitions(${TEST_NAME} PRIVATE -DBOOST_TEST_DYN_LINK)
     endif ()
-    TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba boost_unit_test_framework)
+    TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba Boost::unit_test_framework)
     SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
     SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "Saba Tests")
     ADD_TEST(NAME Saba_${TEST_NAME}

SimDynamics/CMakeLists.txt

@@ -81,7 +81,7 @@ if (SimDynamics_USE_BULLET)
                 target_include_directories(SimDynamics PUBLIC ${GLUT_INCLUDE_DIR})
             ELSE ()
                 # This is the lines for linux.  This should always work if everything is installed and working fine.
-                target_include_directories(SimDynamics PUBLIC /usr/include /usr/local/include ${GLUT_INCLUDE_DIR})
+                target_include_directories(SimDynamics PUBLIC "/usr/include;/usr/local/include;${GLUT_INCLUDE_DIR}")
             ENDIF ()
         ELSE ()
             SET( GLUT_glut_LIBRARY "" CACHE PATH "Glut library." )
@@ -110,7 +110,7 @@ MACRO(ADD_SIMDYNAMICS_TEST TEST_NAME)
   if (NOT Boost_USE_STATIC_LIBS)
       target_compile_definitions(${TEST_NAME} PRIVATE -DBOOST_TEST_DYN_LINK)
   endif ()
-  TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba GraspStudio SimDynamics boost_unit_test_framework)
+  TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Saba GraspStudio SimDynamics Boost::unit_test_framework)
   SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_TEST_DIR})
   SET_TARGET_PROPERTIES(${TEST_NAME} PROPERTIES FOLDER "SimDynamics Tests")
   ADD_TEST(NAME SimDynamics_${TEST_NAME}

SimDynamics/DynamicsEngine/BulletEngine/BulletOpenGL/CMakeLists.txt

@@ -15,6 +15,7 @@ FILE(GLOB INCS ${PROJECT_SOURCE_DIR}/*.h)
 ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS} ${INCS})
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR})
 target_include_directories(${PROJECT_NAME} PUBLIC ${BULLET_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PUBLIC ${GLUT_INCLUDE_DIR})
 if(EXISTS "${BULLET_INCLUDE_DIRS}/bullet")
     target_include_directories(${PROJECT_NAME} PUBLIC ${BULLET_INCLUDE_DIRS}/bullet)
 endif()

VirtualRobot/CMakeLists.txt

@@ -46,7 +46,13 @@ FIND_PACKAGE(Boost COMPONENTS filesystem system program_options thread REQUIRED)
 MESSAGE (STATUS "Boost found at: ${Boost_INCLUDE_DIR}")
 
 target_include_directories(VirtualRobot PUBLIC ${Boost_INCLUDE_DIR})
-target_link_libraries(VirtualRobot PUBLIC ${Boost_LIBRARIES})
+target_link_libraries(VirtualRobot PUBLIC 
+        Boost::boost
+        Boost::filesystem
+        Boost::system
+        Boost::program_options
+        Boost::thread
+)
 # disable boost auto linking
 if (Boost_USE_STATIC_LIBS)
     target_compile_definitions(VirtualRobot PUBLIC -DBOOST_ALL_NO_LIB -DBOOST_TEST_MAIN)
@@ -179,7 +185,7 @@ endif()
 ########################### TESTING #####################################
 MACRO(ADD_VR_TEST TEST_NAME)
     ADD_EXECUTABLE(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.cpp)
-    TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot boost_unit_test_framework)
+    TARGET_LINK_LIBRARIES(${TEST_NAME} PRIVATE VirtualRobot Boost::unit_test_framework)
     target_include_directories(${TEST_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/..)
     if (NOT Boost_USE_STATIC_LIBS)
         target_compile_definitions(${TEST_NAME} PRIVATE -DBOOST_TEST_DYN_LINK)