reorganized files

eclipse-ecal · Jan 12, 2022 · 518e154 · 518e154
1 parent bfc6210
commit 518e154
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
 message(STATUS "Module Path: ${CMAKE_MODULE_PATH}")
 message(STATUS "Prefix Path: ${CMAKE_PREFIX_PATH}")
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/modules)
 
 project(tcp_pubsub)
 
@@ -25,10 +25,10 @@ add_subdirectory(tcp_pubsub)
 
 add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL)
 
-add_subdirectory(performance_publisher)
-add_subdirectory(performance_subscriber)
-add_subdirectory(hello_world_publisher)
-add_subdirectory(hello_world_subscriber)
+add_subdirectory(samples/performance_publisher)
+add_subdirectory(samples/performance_subscriber)
+add_subdirectory(samples/hello_world_publisher)
+add_subdirectory(samples/hello_world_subscriber)
 
 # add_subdirectory(ecal_to_tcp)
 # add_subdirectory(tcp_to_ecal)
diff --git a/ecal_to_tcp/CMakeLists.txt → samples/ecal_to_tcp/CMakeLists.txt b/ecal_to_tcp/CMakeLists.txt → samples/ecal_to_tcp/CMakeLists.txt
diff --git a/ecal_to_tcp/src/main.cpp → samples/ecal_to_tcp/src/main.cpp b/ecal_to_tcp/src/main.cpp → samples/ecal_to_tcp/src/main.cpp
diff --git a/hello_world_publisher/CMakeLists.txt → samples/hello_world_publisher/CMakeLists.txt b/hello_world_publisher/CMakeLists.txt → samples/hello_world_publisher/CMakeLists.txt
diff --git a/hello_world_publisher/src/main.cpp → samples/hello_world_publisher/src/main.cpp b/hello_world_publisher/src/main.cpp → samples/hello_world_publisher/src/main.cpp
diff --git a/hello_world_subscriber/CMakeLists.txt → ...les/hello_world_subscriber/CMakeLists.txt b/hello_world_subscriber/CMakeLists.txt → ...les/hello_world_subscriber/CMakeLists.txt
diff --git a/hello_world_subscriber/src/main.cpp → samples/hello_world_subscriber/src/main.cpp b/hello_world_subscriber/src/main.cpp → samples/hello_world_subscriber/src/main.cpp
diff --git a/performance_publisher/CMakeLists.txt → samples/performance_publisher/CMakeLists.txt b/performance_publisher/CMakeLists.txt → samples/performance_publisher/CMakeLists.txt
diff --git a/performance_publisher/src/main.cpp → samples/performance_publisher/src/main.cpp b/performance_publisher/src/main.cpp → samples/performance_publisher/src/main.cpp
diff --git a/performance_subscriber/CMakeLists.txt → ...les/performance_subscriber/CMakeLists.txt b/performance_subscriber/CMakeLists.txt → ...les/performance_subscriber/CMakeLists.txt
diff --git a/performance_subscriber/src/main.cpp → samples/performance_subscriber/src/main.cpp b/performance_subscriber/src/main.cpp → samples/performance_subscriber/src/main.cpp
diff --git a/tcp_to_ecal/CMakeLists.txt → samples/tcp_to_ecal/CMakeLists.txt b/tcp_to_ecal/CMakeLists.txt → samples/tcp_to_ecal/CMakeLists.txt
diff --git a/tcp_to_ecal/src/main.cpp → samples/tcp_to_ecal/src/main.cpp b/tcp_to_ecal/src/main.cpp → samples/tcp_to_ecal/src/main.cpp
diff --git a/tcp_pubsub/CMakeLists.txt b/tcp_pubsub/CMakeLists.txt
@@ -131,7 +131,7 @@ install(
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
-  "../cmake/tcp_pubsubConfig.cmake.in"
+  "cmake/tcp_pubsubConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake/tcp_pubsubConfig.cmake"
   INSTALL_DESTINATION ${TCP_PUBSUB_INSTALL_CMAKE_DIR}
   PATH_VARS TCP_PUBSUB_INSTALL_CMAKE_DIR

diff --git a/cmake/tcp_pubsubConfig.cmake.in → tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in b/cmake/tcp_pubsubConfig.cmake.in → tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in
diff --git a/cmake/Findasio.cmake → thirdparty/modules/Findasio.cmake b/cmake/Findasio.cmake → thirdparty/modules/Findasio.cmake
@@ -1,7 +1,7 @@
 find_path(Asio_INCLUDE_DIR
   NAMES asio.hpp
   PATHS
-  ${CMAKE_CURRENT_LIST_DIR}/../thirdparty/asio/asio/include
+  ${CMAKE_CURRENT_LIST_DIR}/../asio/asio/include
   include
 )