Skip to content

Commit be43303

Browse files
authored andcommitted
legacy unused includes removed
1 parent 00f2097 commit be43303

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

CMakeLists.txt

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8)
22
project(BTpp)
33

44
set(CMAKE_BUILD_TYPE Release)
5-
add_definitions(-lX11 -Wall -lglut -lGL -lgtest -std=c++11 -pthread -lrt )
5+
add_definitions(-lX11 -Wall -lglut -lGL -lgtest -std=c++11 -lrt )
66
# Needed for using threads
7-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
7+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
88

99

1010

@@ -106,8 +106,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
106106
# COMPILING GTEST
107107
######################################################
108108
if(GTEST_FOUND)
109-
add_executable(btpp_gtest gtest/gtest_tree.cpp ${BTSrcLibrary} ${BTHeadLibrary})
110-
target_link_libraries(btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${X11_LIBRARIES})
109+
#add_executable(btpp_gtest gtest/gtest_tree.cpp ${BTSrcLibrary} ${BTHeadLibrary})
110+
#target_link_libraries(btpp_gtest ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${X11_LIBRARIES})
111111
endif(GTEST_FOUND)
112112

113113
######################################################
@@ -136,35 +136,40 @@ export(TARGETS BTppLib
136136
# (this registers the build-tree with a global CMake-registry)
137137
export(PACKAGE BTpp)
138138

139+
message("******************" ${INSTALL_INCLUDE_DIR})
140+
141+
install(FILES ${BTHeadLibrary} DESTINATION ${INSTALL_INCLUDE_DIR}/include/BTpp)
142+
139143

140144
install(TARGETS BTppLib
141-
# IMPORTANT: Add the foo library to the "export-set"
145+
# IMPORTANT: Add the library to the "export-set"
142146
EXPORT BTppTargets
143-
ARCHIVE DESTINATION "${PROJECT_BINARY_DIR}/arc"
144-
RUNTIME DESTINATION "${PROJECT_BINARY_DIR}/bin" COMPONENT ${PROJECT_SOURCE_DIR}/bin
145-
LIBRARY DESTINATION "${PROJECT_BINARY_DIR}/lib" COMPONENT ${PROJECT_SOURCE_DIR}/shlib
146-
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/BTpp"
147-
COMPONENT dev)
147+
ARCHIVE DESTINATION "${INSTALL_CMAKE_DIR}/BTpp/lib"
148+
RUNTIME DESTINATION "${PROJECT_BINARY_DIR}/bin" COMPONENT ${PROJECT_BINARY_DIR}/bin
149+
LIBRARY DESTINATION "${PROJECT_BINARY_DIR}/lib" COMPONENT ${PROJECT_BINARY_DIR}/shlib
150+
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/include/BTpp"
151+
COMPONENT ${INSTALL_CMAKE_DIR}"include/BTpp")
148152

149153

150-
# Create the FooBarConfig.cmake and FooBarConfigVersion files
154+
# Create the BTppConfig.cmake and BTppConfigVersion files
151155
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
152156
"${INSTALL_INCLUDE_DIR}")
153157
# ... for the build tree
154158

155159

156-
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}")
160+
set(CONF_INCLUDE_DIRS "${INSTALL_INCLUDE_DIR}include/BTpp")
157161
configure_file(conf/BTppConfig.cmake.in
158162
"${PROJECT_BINARY_DIR}/BTppConfig.cmake" @ONLY)
163+
159164
# ... for the install tree
160-
set(CONF_INCLUDE_DIRS "\${BTpp_CMAKE_DIR}/${REL_INCLUDE_DIR}")
165+
#set(CONF_INCLUDE_DIRS "\${BTpp_CMAKE_DIR}/${REL_INCLUDE_DIR}")
161166
configure_file(conf/BTppConfig.cmake.in
162167
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BTppConfig.cmake" @ONLY)
163168
# ... for both
164169
configure_file(conf/BTppConfigVersion.cmake.in
165170
"${PROJECT_BINARY_DIR}/BTppConfigVersion.cmake" @ONLY)
166171

167-
# Install the YARPBTCoreConfig.cmake and YARPBTCoreConfigVersion.cmake
172+
# Install the BTppConfig.cmake and BTppConfigVersion.cmake
168173
install(FILES
169174
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/BTppConfig.cmake"
170175
"${PROJECT_BINARY_DIR}/BTppConfigVersion.cmake"
@@ -175,3 +180,4 @@ install(EXPORT BTppTargets DESTINATION
175180
"${INSTALL_CMAKE_DIR}" COMPONENT dev)
176181

177182

183+
message("******************" ${CONF_INCLUDE_DIRS})

include/tree_node.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040

4141

4242
#include <iostream>
43-
#include <unistd.h>
43+
//#include <unistd.h>
4444

45-
#include <string>
45+
//#include <string>
4646

4747
#include <thread>
4848
#include <chrono>

src/action_node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#include <action_node.h>
14-
#include <string>
14+
//#include <string>
1515

1616

1717
BT::ActionNode::ActionNode(std::string name) : LeafNode::LeafNode(name)

0 commit comments

Comments
 (0)