From 73faf17af15b8e2d0b3c2c6ec4237cd04bb558fc Mon Sep 17 00:00:00 2001 From: Timo Lotterbach Date: Mon, 4 Feb 2013 04:37:01 -0800 Subject: [PATCH] IpcModuleLoader: was moved to LayerManagerUtils, dependencies have been updated Signed-off-by: Timo Lotterbach --- LayerManagerClient/ilmClient/CMakeLists.txt | 7 +-- .../GenericCommunicator/CMakeLists.txt | 2 - LayerManagerPlugins/IpcModules/CMakeLists.txt | 6 --- .../IpcModules/DbusIpcModule/CMakeLists.txt | 1 + .../IpcModules/IpcModuleLoader/CMakeLists.txt | 55 ---------------------- .../IpcModules/TcpIpcModule/CMakeLists.txt | 1 + LayerManagerUtils/CMakeLists.txt | 4 +- .../include/IpcModule.h | 0 .../include/IpcModuleLoader.h | 0 .../src/IpcModuleLoader.cpp | 0 10 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt rename {LayerManagerPlugins/IpcModules/IpcModuleLoader => LayerManagerUtils}/include/IpcModule.h (100%) rename {LayerManagerPlugins/IpcModules/IpcModuleLoader => LayerManagerUtils}/include/IpcModuleLoader.h (100%) rename LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c => LayerManagerUtils/src/IpcModuleLoader.cpp (100%) diff --git a/LayerManagerClient/ilmClient/CMakeLists.txt b/LayerManagerClient/ilmClient/CMakeLists.txt index c50b14d..07bc11f 100644 --- a/LayerManagerClient/ilmClient/CMakeLists.txt +++ b/LayerManagerClient/ilmClient/CMakeLists.txt @@ -27,8 +27,8 @@ find_package(Threads) include_directories( "include" "${CMAKE_SOURCE_DIR}/config" - "${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include" "${CMAKE_SOURCE_DIR}/LayerManagerBase/include" + "${CMAKE_SOURCE_DIR}/LayerManagerUtils/include" ) add_library(${PROJECT_NAME} SHARED @@ -36,13 +36,14 @@ add_library(${PROJECT_NAME} SHARED ) add_dependencies(${PROJECT_NAME} - IpcModuleLoader + LayerManagerUtils ) set(LIBS ${LIBS} - IpcModuleLoader + LayerManagerUtils rt + dl ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt b/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt index 51583cc..4ea6c44 100644 --- a/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt +++ b/LayerManagerPlugins/Communicators/GenericCommunicator/CMakeLists.txt @@ -31,11 +31,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/LayerManagerBase/include ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include ${CMAKE_SOURCE_DIR}/LayerManagerCommands/include - ${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include ) set(LIBS - IpcModuleLoader LayerManagerUtils LayerManagerCommands ) diff --git a/LayerManagerPlugins/IpcModules/CMakeLists.txt b/LayerManagerPlugins/IpcModules/CMakeLists.txt index a80e812..aaf2f77 100644 --- a/LayerManagerPlugins/IpcModules/CMakeLists.txt +++ b/LayerManagerPlugins/IpcModules/CMakeLists.txt @@ -41,9 +41,3 @@ if (WITH_IPC_MODULE_DBUS) set (BUILD_LOADER ON) endif (WITH_IPC_MODULE_DBUS) -#============================================================================== -# IPC MODULE LOADER -#============================================================================== -if (BUILD_LOADER) - add_subdirectory(IpcModuleLoader) -endif (BUILD_LOADER) diff --git a/LayerManagerPlugins/IpcModules/DbusIpcModule/CMakeLists.txt b/LayerManagerPlugins/IpcModules/DbusIpcModule/CMakeLists.txt index 143bb8e..b1c605d 100644 --- a/LayerManagerPlugins/IpcModules/DbusIpcModule/CMakeLists.txt +++ b/LayerManagerPlugins/IpcModules/DbusIpcModule/CMakeLists.txt @@ -28,6 +28,7 @@ include_directories( include ${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include ${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include + ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR} ) diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt b/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt deleted file mode 100644 index eb43a75..0000000 --- a/LayerManagerPlugins/IpcModules/IpcModuleLoader/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################ -# -# Copyright 2012 BMW Car IT GmbH -# -# -# 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. -# -############################################################################ - -cmake_minimum_required (VERSION 2.6) -project_type(CORE) - -include_directories( - "include" - "${PROJECT_SOURCE_DIR}/config" - "${PROJECT_SOURCE_DIR}/LayerManagerUtils/include" - "${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include" - "${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include" -) - -add_library(IpcModuleLoader ${LIBRARY_BUILDMODE} src/IpcModuleLoader.c) - -set(LIBS - dl - ${LIBS} -) -target_link_libraries(IpcModuleLoader ${LIBS}) - -install ( - TARGETS IpcModuleLoader - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/layermanager/static -) - -install ( - FILES include/IpcModule.h - DESTINATION include/ilm -) - -if (WITH_TESTS) -# enable_testing() -# add_executable(IpcModuleLoader_Test tests/IlmCommandTest.cpp) -# target_link_libraries(IpcModuleLoader_Test IpcModuleLoader ${LIBS} gtest) -# add_test(IpcModuleLoader IpcModuleLoader_Test ) -endif(WITH_TESTS) diff --git a/LayerManagerPlugins/IpcModules/TcpIpcModule/CMakeLists.txt b/LayerManagerPlugins/IpcModules/TcpIpcModule/CMakeLists.txt index c33c99d..bd72f80 100644 --- a/LayerManagerPlugins/IpcModules/TcpIpcModule/CMakeLists.txt +++ b/LayerManagerPlugins/IpcModules/TcpIpcModule/CMakeLists.txt @@ -26,6 +26,7 @@ include_directories( include ${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include ${CMAKE_SOURCE_DIR}/LayerManagerPlugins/IpcModules/IpcModuleLoader/include + ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include ) add_library(${PROJECT_NAME} SHARED diff --git a/LayerManagerUtils/CMakeLists.txt b/LayerManagerUtils/CMakeLists.txt index 1ef38ca..e3c8b14 100644 --- a/LayerManagerUtils/CMakeLists.txt +++ b/LayerManagerUtils/CMakeLists.txt @@ -30,6 +30,7 @@ add_library(${PROJECT_NAME} STATIC src/Log.cpp src/LogMessageBuffer.cpp src/ThreadBase.cpp + src/IpcModuleLoader.cpp ) set(INCLUDE_DIRS @@ -40,6 +41,7 @@ set(INCLUDE_DIRS set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT} + dl ) if (WITH_DLT) @@ -85,10 +87,10 @@ if (WITH_TESTS) ) target_link_libraries(${PROJECT_NAME}_Test - ${LIBS} LayerManagerUtils gtest pthread + ${LIBS} ${DLT_LIBRARY} ) diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/include/IpcModule.h b/LayerManagerUtils/include/IpcModule.h similarity index 100% rename from LayerManagerPlugins/IpcModules/IpcModuleLoader/include/IpcModule.h rename to LayerManagerUtils/include/IpcModule.h diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/include/IpcModuleLoader.h b/LayerManagerUtils/include/IpcModuleLoader.h similarity index 100% rename from LayerManagerPlugins/IpcModules/IpcModuleLoader/include/IpcModuleLoader.h rename to LayerManagerUtils/include/IpcModuleLoader.h diff --git a/LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c b/LayerManagerUtils/src/IpcModuleLoader.cpp similarity index 100% rename from LayerManagerPlugins/IpcModules/IpcModuleLoader/src/IpcModuleLoader.c rename to LayerManagerUtils/src/IpcModuleLoader.cpp -- 2.7.4