Skip to content

Commit

Permalink
Solve recursive inclusion problem in RdUtils
Browse files Browse the repository at this point in the history
Since we added Hub to RdUtils, it returned a
recursive inclusion error, which is solved in
this commit
  • Loading branch information
David-Estevez committed Mar 23, 2015
1 parent 1f3b236 commit 2a6f612
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/libraries/RdUtilsLib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ include_directories(${YARP_INCLUDE_DIRS})
include_directories(${RD_INCLUDE_DIRS})

add_library(${KEYWORD} Hub.cpp RdIniReader.hpp RdMacros.hpp RdUtils.hpp RdVector2dBase.hpp RdVocabs.hpp)
target_link_libraries(${KEYWORD} ${YARP_LIBRARIES} ${RD_LIBRARIES} RdInputLib RdMentalMapLib)
target_link_libraries(${KEYWORD} ${YARP_LIBRARIES} ${RD_LIBRARIES})
install(TARGETS ${KEYWORD} DESTINATION lib)

# Exporting dependencies for RDConfig.cmake quite manually for now...
set(RD_INCLUDE_DIRS ${RD_INCLUDE_DIRS} CACHE INTERNAL "appended header dirs") # done in parent
set(RD_INCLUDE_DIRS ${RD_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "appended header dirs") # done in parent
set(RD_LIBRARIES ${RD_LIBRARIES} ${KEYWORD} CACHE INTERNAL "appended libraries") # Not for now as it is a header
1 change: 0 additions & 1 deletion src/libraries/RdUtilsLib/RdUtils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
#include "RdMacros.hpp"
#include "RdVector2dBase.hpp"
#include "RdIniReader.hpp"
#include "Hub.hpp"

0 comments on commit 2a6f612

Please sign in to comment.