Skip to content

Commit 828f248

Browse files
authored andcommitted
test installation rules with travis
1 parent be43303 commit 828f248

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
cmake_minimum_required(VERSION 2.8)
1+
cmake_minimum_required(VERSION 3.0)
22
project(BTpp)
33

44
set(CMAKE_BUILD_TYPE Release)
55
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")
8-
9-
7+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
108

119
#########################################################
1210
# FIND X11
@@ -136,7 +134,6 @@ export(TARGETS BTppLib
136134
# (this registers the build-tree with a global CMake-registry)
137135
export(PACKAGE BTpp)
138136

139-
message("******************" ${INSTALL_INCLUDE_DIR})
140137

141138
install(FILES ${BTHeadLibrary} DESTINATION ${INSTALL_INCLUDE_DIR}/include/BTpp)
142139

@@ -178,6 +175,3 @@ install(FILES
178175
# Install the export set for use with the install-tree
179176
install(EXPORT BTppTargets DESTINATION
180177
"${INSTALL_CMAKE_DIR}" COMPONENT dev)
181-
182-
183-
message("******************" ${CONF_INCLUDE_DIRS})

include/tree_node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <iostream>
4343
//#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)