reenable and fix tests

Author: mikaelarguedas

CMakeLists.txt

@@ -43,7 +43,7 @@ if(WIN32)
   target_compile_definitions(${PROJECT_NAME} PRIVATE "CLASS_LOADER_BUILDING_DLL")
 endif()
 
-if(AMENT_ENABLE_TESTING)
+if(BUILD_TESTING)
   add_subdirectory(test)
 endif()
 

test/CMakeLists.txt

@@ -18,31 +18,36 @@ ament_add_gtest(${PROJECT_NAME}_utest utest.cpp)
 if(TARGET ${PROJECT_NAME}_utest)
   target_include_directories(${PROJECT_NAME}_utest
     PUBLIC "../include" ${console_bridge_INCLUDE_DIRS} ${Poco_INCLUDE_DIRS})
-  target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME} ${Poco_LIBRARIES})
+  target_link_libraries(${PROJECT_NAME}_utest
+    ${PROJECT_NAME}
+    ${PROJECT_NAME}_TestPlugins1
+    ${PROJECT_NAME}_TestPlugins2
+    ${Poco_LIBRARIES}
+    )
   if(NOT WIN32)
     target_link_libraries(${PROJECT_NAME}_utest pthread)
   endif()
-  add_dependencies(${PROJECT_NAME}_utest ${PROJECT_NAME}_TestPlugins1 ${PROJECT_NAME}_TestPlugins2)
 endif()
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
 if(COMPILER_SUPPORTS_CXX11)
-  catkin_add_gtest(${PROJECT_NAME}_unique_ptr_test unique_ptr_test.cpp)
+  find_package(Boost REQUIRED COMPONENTS thread)
+  ament_add_gtest(${PROJECT_NAME}_unique_ptr_test unique_ptr_test.cpp)
   if(TARGET ${PROJECT_NAME}_unique_ptr_test)
+    target_include_directories(${PROJECT_NAME}_unique_ptr_test
+      PUBLIC "../include" ${Boost_INCLUDE_DIRS})
     target_link_libraries(${PROJECT_NAME}_unique_ptr_test
       ${Boost_LIBRARIES}
-      ${class_loader_LIBRARIES}
+      ${PROJECT_NAME}
+      ${PROJECT_NAME}_TestPlugins1
+      ${PROJECT_NAME}_TestPlugins2
     )
     set_target_properties(${PROJECT_NAME}_unique_ptr_test
       PROPERTIES
         COMPILE_FLAGS -std=c++11
         LINK_FLAGS -std=c++11
     )
-    add_dependencies(${PROJECT_NAME}_unique_ptr_test
-      ${PROJECT_NAME}_TestPlugins1
-      ${PROJECT_NAME}_TestPlugins2
-    )
   endif()
 endif()