Skip to content
Snippets Groups Projects
Commit 0780ddcd authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Remove indirect dependencies

parent e4c971f4
No related branches found
No related tags found
2 merge requests!18Release after RAL,!17After 2nd RAL submission
...@@ -95,7 +95,7 @@ message("UPPER_NAME ${UPPER_NAME}") ...@@ -95,7 +95,7 @@ message("UPPER_NAME ${UPPER_NAME}")
#find dependencies. #find dependencies.
FIND_PACKAGE(wolfcore REQUIRED) #FIND_PACKAGE(wolfcore REQUIRED)
FIND_PACKAGE(wolfimu REQUIRED) FIND_PACKAGE(wolfimu REQUIRED)
# Define the directory where will be the configured config.h # Define the directory where will be the configured config.h
...@@ -115,7 +115,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_D ...@@ -115,7 +115,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_D
include_directories("${PROJECT_BINARY_DIR}/conf") include_directories("${PROJECT_BINARY_DIR}/conf")
include_directories("include") include_directories("include")
include_directories(${wolfcore_INCLUDE_DIRS}) #include_directories(${wolfcore_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${wolfimu_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${wolfimu_INCLUDE_DIRS})
#HEADERS #HEADERS
...@@ -207,10 +207,10 @@ endif() ...@@ -207,10 +207,10 @@ endif()
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfcore_LIBRARIES})
# Link the library with the required dependencies # Link the library with the required dependencies
# TARGET_LINK_LIBRARIES(${PLUGIN_NAME} wolfimu_INCLUDE_DIRS) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfimu_LIBRARIES})
# Build demos
IF(BUILD_DEMOS) IF(BUILD_DEMOS)
#Build examples #Build examples
MESSAGE("Building demos.") MESSAGE("Building demos.")
...@@ -218,7 +218,6 @@ IF(BUILD_DEMOS) ...@@ -218,7 +218,6 @@ IF(BUILD_DEMOS)
ENDIF(BUILD_DEMOS) ENDIF(BUILD_DEMOS)
#Build tests #Build tests
#===============EXAMPLE=========================
IF(BUILD_TESTS) IF(BUILD_TESTS)
MESSAGE("Building tests.") MESSAGE("Building tests.")
add_subdirectory(test) add_subdirectory(test)
......
...@@ -22,7 +22,7 @@ add_subdirectory(gtest) ...@@ -22,7 +22,7 @@ add_subdirectory(gtest)
# Include gtest directory. # Include gtest directory.
include_directories(${GTEST_INCLUDE_DIRS} ${wolfimu_INCLUDE_DIRS}) include_directories(${GTEST_INCLUDE_DIRS})
################# ADD YOUR TESTS BELOW #################### ################# ADD YOUR TESTS BELOW ####################
# # # #
...@@ -38,10 +38,10 @@ wolf_add_gtest(gtest_feature_inertial_kinematics gtest_feature_inertial_kinemati ...@@ -38,10 +38,10 @@ wolf_add_gtest(gtest_feature_inertial_kinematics gtest_feature_inertial_kinemati
target_link_libraries(gtest_feature_inertial_kinematics ${PLUGIN_NAME}) target_link_libraries(gtest_feature_inertial_kinematics ${PLUGIN_NAME})
wolf_add_gtest(gtest_factor_inertial_kinematics gtest_factor_inertial_kinematics.cpp) wolf_add_gtest(gtest_factor_inertial_kinematics gtest_factor_inertial_kinematics.cpp)
target_link_libraries(gtest_factor_inertial_kinematics ${PLUGIN_NAME} ${wolfimu_LIBRARIES}) target_link_libraries(gtest_factor_inertial_kinematics ${PLUGIN_NAME})
wolf_add_gtest(gtest_factor_force_torque gtest_factor_force_torque.cpp) wolf_add_gtest(gtest_factor_force_torque gtest_factor_force_torque.cpp)
target_link_libraries(gtest_factor_force_torque ${PLUGIN_NAME} ${wolfimu_LIBRARIES}) target_link_libraries(gtest_factor_force_torque ${PLUGIN_NAME})
wolf_add_gtest(gtest_force_torque_delta_tools gtest_force_torque_delta_tools.cpp) wolf_add_gtest(gtest_force_torque_delta_tools gtest_force_torque_delta_tools.cpp)
target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME}) target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME})
...@@ -50,10 +50,10 @@ target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME}) ...@@ -50,10 +50,10 @@ target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME})
# target_link_libraries(gtest_feature_force_torque_preint ${PLUGIN_NAME}) # target_link_libraries(gtest_feature_force_torque_preint ${PLUGIN_NAME})
wolf_add_gtest(gtest_processor_inertial_kinematics gtest_processor_inertial_kinematics.cpp) wolf_add_gtest(gtest_processor_inertial_kinematics gtest_processor_inertial_kinematics.cpp)
target_link_libraries(gtest_processor_inertial_kinematics ${PLUGIN_NAME} ${wolfimu_LIBRARIES}) target_link_libraries(gtest_processor_inertial_kinematics ${PLUGIN_NAME})
wolf_add_gtest(gtest_processor_force_torque_preint gtest_processor_force_torque_preint.cpp) wolf_add_gtest(gtest_processor_force_torque_preint gtest_processor_force_torque_preint.cpp)
target_link_libraries(gtest_processor_force_torque_preint ${PLUGIN_NAME} ${wolfimu_LIBRARIES}) target_link_libraries(gtest_processor_force_torque_preint ${PLUGIN_NAME})
wolf_add_gtest(gtest_processor_point_feet_nomove gtest_processor_point_feet_nomove.cpp) wolf_add_gtest(gtest_processor_point_feet_nomove gtest_processor_point_feet_nomove.cpp)
target_link_libraries(gtest_processor_point_feet_nomove ${PLUGIN_NAME}) target_link_libraries(gtest_processor_point_feet_nomove ${PLUGIN_NAME})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment