From 14e321ee5d3742d99bf5c3f2be8349cf0a8cf8c3 Mon Sep 17 00:00:00 2001
From: Sergi Foix Salmeron <sfoix@iri.upc.edu>
Date: Thu, 28 May 2020 18:18:18 +0200
Subject: [PATCH] CMakeLists.txt indentation format
---
CMakeLists.txt | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d281619..1f80392 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,11 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
-include_directories(include)
-include_directories(${catkin_INCLUDE_DIRS})
+# include_directories(include)
+include_directories(
+ include
+ ${catkin_INCLUDE_DIRS}
+)
## Declare a cpp library
# add_library(iri_ros_tool
@@ -96,10 +99,19 @@ include_directories(${catkin_INCLUDE_DIRS})
add_library(${PROJECT_NAME} src/timeout.cpp src/watchdog.cpp)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
-add_library(modules include/${PROJECT_NAME}/module_common.h include/${PROJECT_NAME}/module.h include/${PROJECT_NAME}/module_service.h include/${PROJECT_NAME}/module_action.h include/${PROJECT_NAME}/module_exceptions.h include/${PROJECT_NAME}/module_dyn_reconf.h)
+add_library(modules
+ include/${PROJECT_NAME}/module_common.h
+ include/${PROJECT_NAME}/module.h
+ include/${PROJECT_NAME}/module_service.h
+ include/${PROJECT_NAME}/module_action.h
+ include/${PROJECT_NAME}/module_exceptions.h
+ include/${PROJECT_NAME}/module_dyn_reconf.h
+)
set_target_properties(modules PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(modules ${PROJECT_NAME})
-target_link_libraries(modules ${catkin_LIBRARIES})
+target_link_libraries(modules
+ ${PROJECT_NAME}
+ ${catkin_LIBRARIES}
+)
## Declare a cpp executable
--
GitLab