public/vio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed compile-flag name USE_ROS to SVO_USE_ROS because PCL uses the same flag

Browse Source
This commit is contained in:
Christian Forster
2014-04-04 20:10:39 +02:00
parent 0454a92de3
commit c6b308ca14
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svo/CMakeLists.txt
+1 -1
View File
@@ -32,7 +32,7 @@ ENDIF()
IF(HAVE_G2O) IF(HAVE_G2O)
ADD_DEFINITIONS(-DUSE_BUNDLE_ADJUSTMENT) ADD_DEFINITIONS(-DUSE_BUNDLE_ADJUSTMENT)
ENDIF() ENDIF()
ADD_DEFINITIONS(-DUSE_ROS) ADD_DEFINITIONS(-DSVO_USE_ROS)
# Set build flags # Set build flags
SET(CMAKE_CXX_FLAGS "-Wall -Werror -D_LINUX -D_REENTRANT -march=native -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unknown-pragmas") SET(CMAKE_CXX_FLAGS "-Wall -Werror -D_LINUX -D_REENTRANT -march=native -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unknown-pragmas")
svo/include/svo/global.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include <vikit/performance_monitor.h> #include <vikit/performance_monitor.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#ifdef USE_ROS #ifdef SVO_USE_ROS
#include <ros/console.h> #include <ros/console.h>
#define SVO_DEBUG_STREAM(x) ROS_DEBUG_STREAM(x) #define SVO_DEBUG_STREAM(x) ROS_DEBUG_STREAM(x)
#define SVO_INFO_STREAM(x) ROS_INFO_STREAM(x) #define SVO_INFO_STREAM(x) ROS_INFO_STREAM(x)
svo/src/config.cpp
+2 -2
View File
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef USE_ROS #ifdef SVO_USE_ROS
#include <vikit/params_helper.h> #include <vikit/params_helper.h>
#endif #endif
#include <svo/config.h> #include <svo/config.h>
@@ -22,7 +22,7 @@
namespace svo { namespace svo {
Config::Config() : Config::Config() :
#ifdef USE_ROS #ifdef SVO_USE_ROS
trace_name(vk::getParam<string>("svo/trace_name", "svo")), trace_name(vk::getParam<string>("svo/trace_name", "svo")),
trace_dir(vk::getParam<string>("svo/trace_dir", "/tmp")), trace_dir(vk::getParam<string>("svo/trace_dir", "/tmp")),
n_pyr_levels(vk::getParam<int>("svo/n_pyr_levels", 3)), n_pyr_levels(vk::getParam<int>("svo/n_pyr_levels", 3)),