From 7cd96c0d9488d87d9959b1f5a7b5f739e5cdaa08 Mon Sep 17 00:00:00 2001
From: Sergi Foix Salmeron <sfoix@iri.upc.edu>
Date: Thu, 28 May 2020 18:29:48 +0200
Subject: [PATCH] comment DEBUG cmake build and re-structure
---
CMakeLists.txt | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da4bc85..157d8e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.3)
project(iri_base_driver)
-set(CMAKE_BUILD_TYPE "DEBUG")
+# set(CMAKE_BUILD_TYPE "DEBUG")
## Add support for C++11, supported in ROS Kinetic and newer
# add_definitions(-std=c++11)
@@ -9,9 +9,14 @@ set(CMAKE_BUILD_TYPE "DEBUG")
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure message_generation)
+find_package(catkin REQUIRED COMPONENTS
+ roscpp
+ dynamic_reconfigure
+ message_generation
+)
## System dependencies are found with CMake's conventions
+# find_package(Boost REQUIRED COMPONENTS system)
find_package(Boost REQUIRED COMPONENTS system thread)
## Uncomment this if the package has a setup.py. This macro ensures
@@ -92,17 +97,21 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
-INCLUDE_DIRECTORIES(include)
-include_directories(${catkin_INCLUDE_DIRS})
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(
+ include
+ ${catkin_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+)
## Declare a cpp library
# add_library(foo
# src/${PROJECT_NAME}/foo.cpp
# )
add_library(${PROJECT_NAME} src/iri_base_driver.cpp)
-target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}
+ ${catkin_LIBRARIES}
+ ${Boost_LIBRARIES}
+)
## Declare a cpp executable
# add_executable(foo_node src/foo_node.cpp)
--
GitLab