cleanup CMakeLists.txt to better group source files (eclipse-ecal#12)

removed all doubled copyright headers
wep21 · Dec 2, 2020 · 595203d · 595203d
1 parent edc96ee
commit 595203d
Show file tree

Hide file tree

Showing 50 changed files with 27 additions and 938 deletions.
diff --git a/rmw_ecal_dynamic_cpp/CMakeLists.txt b/rmw_ecal_dynamic_cpp/CMakeLists.txt
@@ -46,7 +46,7 @@ set(SUPPORTED_DISTROS
 list(FIND SUPPORTED_DISTROS $ENV{ROS_DISTRO} index)
 
 if(index EQUAL -1)
-	message(FATAL_ERROR "'$ENV{ROS_DISTRO}' is an unsupported ros2 distro.")
+  message(FATAL_ERROR "'$ENV{ROS_DISTRO}' is an unsupported ros2 distro.")
 endif()
 
 add_definitions("-DROLLING=0")
@@ -58,7 +58,7 @@ add_definitions("-DROS_DISTRO=$<UPPER_CASE:$ENV{ROS_DISTRO}>")
 
 option(USE_PROTOBUF_SERIALIZATION "Use google protobuf as serialization format." OFF)
 if(USE_PROTOBUF_SERIALIZATION)
-	add_definitions(-DUSE_PROTOBUF_SERIALIZATION)
+  add_definitions(-DUSE_PROTOBUF_SERIALIZATION)
 endif()
 
 find_package(rmw REQUIRED)
@@ -83,7 +83,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/src
 )
 
-add_library(${PROJECT_NAME} SHARED
+set(rwm_ecal_cpp
   src/event.cpp
   src/get_node_info_and_types.cpp
   src/get_service_names_and_types.cpp
@@ -92,14 +92,28 @@ add_library(${PROJECT_NAME} SHARED
   src/init_options.cpp
   src/init.cpp
   src/rmw.cpp
+)
+
+set(rwm_ecal_internal_serialization_custom_cpp
   src/internal/serialization/custom/serializer_cpp.cpp
   src/internal/serialization/custom/serializer_c.cpp
   src/internal/serialization/custom/deserializer_cpp.cpp
   src/internal/serialization/custom/deserializer_c.cpp
-  src/internal/serialization/protobuf/serializer_cpp.cpp
-  src/internal/serialization/protobuf/serializer_c.cpp
-  src/internal/serialization/protobuf/deserializer_cpp.cpp
-  src/internal/serialization/protobuf/deserializer_c.cpp
+)
+
+if(USE_PROTOBUF_SERIALIZATION)
+  set(rwm_ecal_internal_serialization_protobuf_cpp
+    src/internal/serialization/protobuf/serializer_cpp.cpp
+    src/internal/serialization/protobuf/serializer_c.cpp
+    src/internal/serialization/protobuf/deserializer_cpp.cpp
+    src/internal/serialization/protobuf/deserializer_c.cpp
+  )
+endif()
+
+add_library(${PROJECT_NAME} SHARED
+  ${rwm_ecal_cpp}
+  ${rwm_ecal_internal_serialization_custom_cpp}
+  ${rwm_ecal_internal_serialization_protobuf_cpp}
 )
 
 set(proto_files
@@ -132,6 +146,12 @@ install(
   RUNTIME DESTINATION bin
 )
 
+source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES 
+  ${rwm_ecal_cpp}
+  ${rwm_ecal_internal_serialization_custom_cpp}
+  ${rwm_ecal_internal_serialization_protobuf_cpp}
+)
+
 register_rmw_implementation(
   "c:rosidl_typesupport_c:rosidl_typesupport_introspection_c"
   "cpp:rosidl_typesupport_cpp:rosidl_typesupport_introspection_cpp"

diff --git a/rmw_ecal_dynamic_cpp/src/event.cpp b/rmw_ecal_dynamic_cpp/src/event.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/event.h>
 #include <rmw/rmw.h>
 

diff --git a/rmw_ecal_dynamic_cpp/src/get_node_info_and_types.cpp b/rmw_ecal_dynamic_cpp/src/get_node_info_and_types.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/get_node_info_and_types.h>
 
 #include <rmw/rmw.h>

diff --git a/rmw_ecal_dynamic_cpp/src/get_service_names_and_types.cpp b/rmw_ecal_dynamic_cpp/src/get_service_names_and_types.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/get_service_names_and_types.h>
 
 #include <rmw/rmw.h>

diff --git a/rmw_ecal_dynamic_cpp/src/get_topic_endpoint_info.cpp b/rmw_ecal_dynamic_cpp/src/get_topic_endpoint_info.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #if ROS_DISTRO >= FOXY
 
 #include <rmw/get_topic_endpoint_info.h>

diff --git a/rmw_ecal_dynamic_cpp/src/get_topic_names_and_types.cpp b/rmw_ecal_dynamic_cpp/src/get_topic_names_and_types.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/get_topic_names_and_types.h>
 
 #include <rmw/rmw.h>

diff --git a/rmw_ecal_dynamic_cpp/src/init.cpp b/rmw_ecal_dynamic_cpp/src/init.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/init.h>
 
 #include <rmw/rmw.h>

diff --git a/rmw_ecal_dynamic_cpp/src/init_options.cpp b/rmw_ecal_dynamic_cpp/src/init_options.cpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #include <rmw/init_options.h>
 #include <rmw/rmw.h>
 #include <rmw/types.h>

diff --git a/rmw_ecal_dynamic_cpp/src/internal/client.hpp b/rmw_ecal_dynamic_cpp/src/internal/client.hpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #pragma once
 
 #include <string>

diff --git a/rmw_ecal_dynamic_cpp/src/internal/common.hpp b/rmw_ecal_dynamic_cpp/src/internal/common.hpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
-*
-* Copyright (C) 2019 - 2020 Continental Corporation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* 
-*      http://www.apache.org/licenses/LICENSE-2.0
-* 
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-* ========================= RMW eCAL LICENSE =================================
-*/
-
 #pragma once
 
 #include <string>

diff --git a/rmw_ecal_dynamic_cpp/src/internal/event.hpp b/rmw_ecal_dynamic_cpp/src/internal/event.hpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #pragma once
 
 #include <atomic>

diff --git a/rmw_ecal_dynamic_cpp/src/internal/graph.hpp b/rmw_ecal_dynamic_cpp/src/internal/graph.hpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #pragma once
 
 #include <string>

diff --git a/rmw_ecal_dynamic_cpp/src/internal/guard_condition.hpp b/rmw_ecal_dynamic_cpp/src/internal/guard_condition.hpp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/* ========================= RMW eCAL LICENSE =================================
- *
- * Copyright (C) 2019 - 2020 Continental Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================= RMW eCAL LICENSE =================================
-*/
-
 #pragma once
 
 #include <atomic>