diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2016-12-30 17:47:39 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-12 18:36:30 +0200 |
commit | 1c58e66069fe65a94234e322cd76051e0aaa30e2 (patch) | |
tree | c53ae86a4bea52ef5c75f988a4961b8f579229fd /src/3rd_party-static | |
parent | 7063ed619c92d795a46f221fc9935a2249e65bf2 (diff) | |
download | sdl_core-1c58e66069fe65a94234e322cd76051e0aaa30e2.tar.gz |
Refactor CMake files
Merge components refactoring from Windows port barnch
- add cmake tools
- refactor protocol handler CMakeLists.txt file
- refactor interfaces CMakeLists.txt file
- refactor smart object CMakeLists.txt file
- refactor formatters CMakeLists.txt file
- refactor config profile CMakeLists.txt file
- refactor policy CMakeLists.txt file
- refactor resumption CMakeLists.txt file
- refactor connection handler CMakeLists.txt file
- refactor application manager CMakeLists.txt file
- refactor security manager CMakeLists.txt file
- refactor dbus CMakeLists.txt file
- refactor hmi message handler CMakeLists.txt file
- refactor transport manager CMakeLists.txt file
- refactor utils CMakeLists.txt file
- refactor components root CMakeLists.txt file
- refactor utils CMakeLists.txt file
- refactor components root CMakeLists.txt file
- refactor media manager CMakeLists.txt file
- refactor telemetry monitor CMakeLists.txt file
- refactor appmain CMakeLists.txt file
- refactor plugins CMakeLists.txt file
- refactor 3rd party CMakeLists.txt files
- create cmake helper for interface generation
- refactor root CMakeLists.txt file
Move cmake modules to tools
Rename src/3rd_party-static/MessageBroker to message_broker
Related tasks APPLINK-30588 APPLINK-30972
Diffstat (limited to 'src/3rd_party-static')
-rw-r--r-- | src/3rd_party-static/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/3rd_party-static/MessageBroker/CMakeLists.txt | 39 | ||||
-rw-r--r-- | src/3rd_party-static/encryption/CMakeLists.txt | 39 | ||||
-rw-r--r-- | src/3rd_party-static/jsoncpp/CMakeLists.txt | 44 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/CMakeLists.txt | 78 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/CMessageBroker.hpp (renamed from src/3rd_party-static/MessageBroker/include/CMessageBroker.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/CMessageBrokerRegistry.hpp (renamed from src/3rd_party-static/MessageBroker/include/CMessageBrokerRegistry.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/CSender.hpp (renamed from src/3rd_party-static/MessageBroker/include/CSender.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/MBDebugHelper.h (renamed from src/3rd_party-static/MessageBroker/include/MBDebugHelper.h) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/mb_client.hpp (renamed from src/3rd_party-static/MessageBroker/include/mb_client.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/mb_controller.hpp (renamed from src/3rd_party-static/MessageBroker/include/mb_controller.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/mb_server.hpp (renamed from src/3rd_party-static/MessageBroker/include/mb_server.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/mb_tcpclient.hpp (renamed from src/3rd_party-static/MessageBroker/include/mb_tcpclient.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/mb_tcpserver.hpp (renamed from src/3rd_party-static/MessageBroker/include/mb_tcpserver.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/networking.h (renamed from src/3rd_party-static/MessageBroker/include/networking.h) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/system.h (renamed from src/3rd_party-static/MessageBroker/include/system.h) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/include/websocket_handler.hpp (renamed from src/3rd_party-static/MessageBroker/include/websocket_handler.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/client/mb_client.cpp (renamed from src/3rd_party-static/MessageBroker/src/client/mb_client.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/client/mb_controller.cpp (renamed from src/3rd_party-static/MessageBroker/src/client/mb_controller.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/client/mb_tcpclient.cpp (renamed from src/3rd_party-static/MessageBroker/src/client/mb_tcpclient.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.cpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.hpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.cpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.hpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.cpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.hpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerServer.cpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/example/MessageBrokerServer.hpp (renamed from src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.hpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBroker.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/libMBDebugHelper.h (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/libMBDebugHelper.h) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/md5.cpp (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/md5.h (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.h) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/system.cpp (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/system.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp (renamed from src/3rd_party-static/MessageBroker/src/lib_messagebroker/websocket_handler.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/server/mb_server.cpp (renamed from src/3rd_party-static/MessageBroker/src/server/mb_server.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp (renamed from src/3rd_party-static/MessageBroker/src/server/mb_tcpserver.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/message_broker/src/server/networking.cpp (renamed from src/3rd_party-static/MessageBroker/src/server/networking.cpp) | 0 | ||||
-rw-r--r-- | src/3rd_party-static/test/CMakeLists.txt | 15 |
39 files changed, 158 insertions, 64 deletions
diff --git a/src/3rd_party-static/CMakeLists.txt b/src/3rd_party-static/CMakeLists.txt index 8dfcf6595a..2acd7be27c 100644 --- a/src/3rd_party-static/CMakeLists.txt +++ b/src/3rd_party-static/CMakeLists.txt @@ -32,8 +32,8 @@ add_subdirectory(./jsoncpp) set(JSONCPP_INCLUDE_DIRECTORY ${JSONCPP_INCLUDE_DIRECTORY} PARENT_SCOPE) -# --- MessageBroker -add_subdirectory(./MessageBroker) +# --- Message Broker +add_subdirectory(./message_broker) set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${MESSAGE_BROKER_INCLUDE_DIRECTORY} PARENT_SCOPE) # --- encryption @@ -48,6 +48,9 @@ if (BUILD_USB_SUPPORT) endif() endif() +# --- gmock if(BUILD_TESTS) + add_subdirectory(./gmock-1.7.0) + set(GMOCK_INCLUDE_DIRECTORY ${GMOCK_INCLUDE_DIRECTORY} PARENT_SCOPE) add_subdirectory(test) endif() diff --git a/src/3rd_party-static/MessageBroker/CMakeLists.txt b/src/3rd_party-static/MessageBroker/CMakeLists.txt deleted file mode 100644 index 87a0fe2a2a..0000000000 --- a/src/3rd_party-static/MessageBroker/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include) -set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${MESSAGE_BROKER_INCLUDE_DIRECTORY} PARENT_SCOPE) - -include_directories ( - ./include/ - ../jsoncpp/include - ../../components/utils/include - -) - -set (MESSAGE_BROKER_SOURCES - ./src/lib_messagebroker/CMessageBroker.cpp - ./src/lib_messagebroker/CMessageBrokerRegistry.cpp - ./src/lib_messagebroker/md5.cpp - ./src/lib_messagebroker/system.cpp - ./src/lib_messagebroker/websocket_handler.cpp -) - -set (MESSAGE_BROKER_CLIENT_SOURCES - ./src/client/mb_client.cpp - ./src/client/mb_tcpclient.cpp - ./src/client/mb_controller.cpp -) - -set (MESSAGE_BROKER_SERVER_SOURCES - ./src/server/mb_server.cpp - ./src/server/mb_tcpserver.cpp - ./src/server/networking.cpp -) - -add_library("MessageBroker" ${MESSAGE_BROKER_SOURCES}) -target_link_libraries(MessageBroker Utils) - - -add_library("MessageBrokerClient" ${MESSAGE_BROKER_CLIENT_SOURCES}) -target_link_libraries("MessageBrokerClient" "MessageBroker") - -add_library("MessageBrokerServer" ${MESSAGE_BROKER_SERVER_SOURCES}) -target_link_libraries("MessageBrokerServer" "MessageBroker") diff --git a/src/3rd_party-static/encryption/CMakeLists.txt b/src/3rd_party-static/encryption/CMakeLists.txt index 3802c83cb5..5096f59c22 100644 --- a/src/3rd_party-static/encryption/CMakeLists.txt +++ b/src/3rd_party-static/encryption/CMakeLists.txt @@ -1,14 +1,43 @@ +# Copyright (c) 2015, Ford Motor Company +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following +# disclaimer in the documentation and/or other materials provided with the +# distribution. +# +# Neither the name of the Ford Motor Company nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) + set(ENCRYPTION_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include) set(ENCRYPTION_INCLUDE_DIRECTORY ${ENCRYPTION_INCLUDE_DIRECTORY} PARENT_SCOPE) include_directories ( - ./include + ${ENCRYPTION_INCLUDE_DIRECTORY} ) -set (SOURCES - ./src/Base64.cpp - ./src/hashing.cc -) +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") set (LIBRARIES crypto) diff --git a/src/3rd_party-static/jsoncpp/CMakeLists.txt b/src/3rd_party-static/jsoncpp/CMakeLists.txt index 04a4bd960c..ac273cfe7b 100644 --- a/src/3rd_party-static/jsoncpp/CMakeLists.txt +++ b/src/3rd_party-static/jsoncpp/CMakeLists.txt @@ -1,14 +1,42 @@ +# Copyright (c) 2016, Ford Motor Company +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following +# disclaimer in the documentation and/or other materials provided with the +# distribution. +# +# Neither the name of the Ford Motor Company nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) + set(JSONCPP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include) set(JSONCPP_INCLUDE_DIRECTORY ${JSONCPP_INCLUDE_DIRECTORY} PARENT_SCOPE) -include_directories ( - ./include/ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/include ) -set (SOURCES - ./src/lib_json/json_value.cpp - ./src/lib_json/json_writer.cpp - ./src/lib_json/json_reader.cpp -) +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/lib_json") -add_library("jsoncpp" ${SOURCES}) +add_library(jsoncpp ${SOURCES}) diff --git a/src/3rd_party-static/message_broker/CMakeLists.txt b/src/3rd_party-static/message_broker/CMakeLists.txt new file mode 100644 index 0000000000..348d050887 --- /dev/null +++ b/src/3rd_party-static/message_broker/CMakeLists.txt @@ -0,0 +1,78 @@ +# Copyright (c) 2016, Ford Motor Company +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following +# disclaimer in the documentation and/or other materials provided with the +# distribution. +# +# Neither the name of the Ford Motor Company nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) + +set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include) +set(MESSAGE_BROKER_INCLUDE_DIRECTORY ${MESSAGE_BROKER_INCLUDE_DIRECTORY} PARENT_SCOPE) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${JSONCPP_INCLUDE_DIRECTORY} +) + +set(CLIENT_PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/src/client +) +collect_sources(CLIENT_SOURCES "${CLIENT_PATHS}") + +set(SERVER_PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/src/server +) +collect_sources(SERVER_SOURCES "${SERVER_PATHS}") + +set(EXCLUDE_PATHS + ${CLIENT_PATHS} + ${SERVER_PATHS} + ${CMAKE_CURRENT_SOURCE_DIR}/src/example +) + +set(PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src +) +collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}") + +set(LIBRARIES + Utils +) + +add_library(message_broker ${SOURCES}) +target_link_libraries(message_broker ${LIBRARIES}) + +list(APPEND LIBRARIES + message_broker +) + +add_library(message_broker_client ${CLIENT_SOURCES}) +target_link_libraries(message_broker_client ${LIBRARIES}) + +add_library(message_broker_server ${SERVER_SOURCES}) +target_link_libraries(message_broker_server ${LIBRARIES}) diff --git a/src/3rd_party-static/MessageBroker/include/CMessageBroker.hpp b/src/3rd_party-static/message_broker/include/CMessageBroker.hpp index c542043796..c542043796 100644 --- a/src/3rd_party-static/MessageBroker/include/CMessageBroker.hpp +++ b/src/3rd_party-static/message_broker/include/CMessageBroker.hpp diff --git a/src/3rd_party-static/MessageBroker/include/CMessageBrokerRegistry.hpp b/src/3rd_party-static/message_broker/include/CMessageBrokerRegistry.hpp index 001f978bbf..001f978bbf 100644 --- a/src/3rd_party-static/MessageBroker/include/CMessageBrokerRegistry.hpp +++ b/src/3rd_party-static/message_broker/include/CMessageBrokerRegistry.hpp diff --git a/src/3rd_party-static/MessageBroker/include/CSender.hpp b/src/3rd_party-static/message_broker/include/CSender.hpp index 78faf7dad2..78faf7dad2 100644 --- a/src/3rd_party-static/MessageBroker/include/CSender.hpp +++ b/src/3rd_party-static/message_broker/include/CSender.hpp diff --git a/src/3rd_party-static/MessageBroker/include/MBDebugHelper.h b/src/3rd_party-static/message_broker/include/MBDebugHelper.h index fa835da3f0..fa835da3f0 100644 --- a/src/3rd_party-static/MessageBroker/include/MBDebugHelper.h +++ b/src/3rd_party-static/message_broker/include/MBDebugHelper.h diff --git a/src/3rd_party-static/MessageBroker/include/mb_client.hpp b/src/3rd_party-static/message_broker/include/mb_client.hpp index cd70a31cd8..cd70a31cd8 100644 --- a/src/3rd_party-static/MessageBroker/include/mb_client.hpp +++ b/src/3rd_party-static/message_broker/include/mb_client.hpp diff --git a/src/3rd_party-static/MessageBroker/include/mb_controller.hpp b/src/3rd_party-static/message_broker/include/mb_controller.hpp index 2d196aced2..2d196aced2 100644 --- a/src/3rd_party-static/MessageBroker/include/mb_controller.hpp +++ b/src/3rd_party-static/message_broker/include/mb_controller.hpp diff --git a/src/3rd_party-static/MessageBroker/include/mb_server.hpp b/src/3rd_party-static/message_broker/include/mb_server.hpp index 684a89055a..684a89055a 100644 --- a/src/3rd_party-static/MessageBroker/include/mb_server.hpp +++ b/src/3rd_party-static/message_broker/include/mb_server.hpp diff --git a/src/3rd_party-static/MessageBroker/include/mb_tcpclient.hpp b/src/3rd_party-static/message_broker/include/mb_tcpclient.hpp index 07697dbde7..07697dbde7 100644 --- a/src/3rd_party-static/MessageBroker/include/mb_tcpclient.hpp +++ b/src/3rd_party-static/message_broker/include/mb_tcpclient.hpp diff --git a/src/3rd_party-static/MessageBroker/include/mb_tcpserver.hpp b/src/3rd_party-static/message_broker/include/mb_tcpserver.hpp index 8ab2ce6a6d..8ab2ce6a6d 100644 --- a/src/3rd_party-static/MessageBroker/include/mb_tcpserver.hpp +++ b/src/3rd_party-static/message_broker/include/mb_tcpserver.hpp diff --git a/src/3rd_party-static/MessageBroker/include/networking.h b/src/3rd_party-static/message_broker/include/networking.h index a08853bb31..a08853bb31 100644 --- a/src/3rd_party-static/MessageBroker/include/networking.h +++ b/src/3rd_party-static/message_broker/include/networking.h diff --git a/src/3rd_party-static/MessageBroker/include/system.h b/src/3rd_party-static/message_broker/include/system.h index fac4f7926b..fac4f7926b 100644 --- a/src/3rd_party-static/MessageBroker/include/system.h +++ b/src/3rd_party-static/message_broker/include/system.h diff --git a/src/3rd_party-static/MessageBroker/include/websocket_handler.hpp b/src/3rd_party-static/message_broker/include/websocket_handler.hpp index 8bed007436..8bed007436 100644 --- a/src/3rd_party-static/MessageBroker/include/websocket_handler.hpp +++ b/src/3rd_party-static/message_broker/include/websocket_handler.hpp diff --git a/src/3rd_party-static/MessageBroker/src/client/mb_client.cpp b/src/3rd_party-static/message_broker/src/client/mb_client.cpp index 6342c776a8..6342c776a8 100644 --- a/src/3rd_party-static/MessageBroker/src/client/mb_client.cpp +++ b/src/3rd_party-static/message_broker/src/client/mb_client.cpp diff --git a/src/3rd_party-static/MessageBroker/src/client/mb_controller.cpp b/src/3rd_party-static/message_broker/src/client/mb_controller.cpp index 8a4a77cf30..8a4a77cf30 100644 --- a/src/3rd_party-static/MessageBroker/src/client/mb_controller.cpp +++ b/src/3rd_party-static/message_broker/src/client/mb_controller.cpp diff --git a/src/3rd_party-static/MessageBroker/src/client/mb_tcpclient.cpp b/src/3rd_party-static/message_broker/src/client/mb_tcpclient.cpp index 02db417c26..02db417c26 100644 --- a/src/3rd_party-static/MessageBroker/src/client/mb_tcpclient.cpp +++ b/src/3rd_party-static/message_broker/src/client/mb_tcpclient.cpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.cpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.cpp index 77ab1ca2c1..77ab1ca2c1 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.cpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.cpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.hpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.hpp index 47e684a7e4..47e684a7e4 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerAVA.hpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerAVA.hpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.cpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.cpp index cbbe39492b..cbbe39492b 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.cpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.cpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.hpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.hpp index b79411dc98..b79411dc98 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerBackend.hpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerBackend.hpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.cpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.cpp index 6f308e71c2..6f308e71c2 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.cpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.cpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.hpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.hpp index e6f4898226..e6f4898226 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerControllerPhone.hpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerControllerPhone.hpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.cpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerServer.cpp index 405b3fcbd5..405b3fcbd5 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.cpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerServer.cpp diff --git a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.hpp b/src/3rd_party-static/message_broker/src/example/MessageBrokerServer.hpp index 884ed0309f..884ed0309f 100644 --- a/src/3rd_party-static/MessageBroker/src/example/MessageBrokerServer.hpp +++ b/src/3rd_party-static/message_broker/src/example/MessageBrokerServer.hpp diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBroker.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp index 3b14489a8c..3b14489a8c 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBroker.cpp +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp index fb24d08f1c..fb24d08f1c 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/libMBDebugHelper.h b/src/3rd_party-static/message_broker/src/lib_messagebroker/libMBDebugHelper.h index 0d5260cdda..0d5260cdda 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/libMBDebugHelper.h +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/libMBDebugHelper.h diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/md5.cpp index b3e347d9d7..b3e347d9d7 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.cpp +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/md5.cpp diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.h b/src/3rd_party-static/message_broker/src/lib_messagebroker/md5.h index 2c54c03b1b..2c54c03b1b 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/md5.h +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/md5.h diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/system.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/system.cpp index 456362f9d8..456362f9d8 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/system.cpp +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/system.cpp diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/websocket_handler.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp index 7d3890b7a8..7d3890b7a8 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/websocket_handler.cpp +++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp diff --git a/src/3rd_party-static/MessageBroker/src/server/mb_server.cpp b/src/3rd_party-static/message_broker/src/server/mb_server.cpp index 25ec7fc9f3..25ec7fc9f3 100644 --- a/src/3rd_party-static/MessageBroker/src/server/mb_server.cpp +++ b/src/3rd_party-static/message_broker/src/server/mb_server.cpp diff --git a/src/3rd_party-static/MessageBroker/src/server/mb_tcpserver.cpp b/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp index bdd7b2bfdf..bdd7b2bfdf 100644 --- a/src/3rd_party-static/MessageBroker/src/server/mb_tcpserver.cpp +++ b/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp diff --git a/src/3rd_party-static/MessageBroker/src/server/networking.cpp b/src/3rd_party-static/message_broker/src/server/networking.cpp index f054431690..f054431690 100644 --- a/src/3rd_party-static/MessageBroker/src/server/networking.cpp +++ b/src/3rd_party-static/message_broker/src/server/networking.cpp diff --git a/src/3rd_party-static/test/CMakeLists.txt b/src/3rd_party-static/test/CMakeLists.txt index 33bcd82694..a38a392a01 100644 --- a/src/3rd_party-static/test/CMakeLists.txt +++ b/src/3rd_party-static/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2015, Ford Motor Company +# Copyright (c) 2016, Ford Motor Company # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,21 +28,16 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -if(BUILD_TESTS) -include_directories ( +include_directories( ${GMOCK_INCLUDE_DIRECTORY} ${JSONCPP_INCLUDE_DIRECTORY} ) +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") + set(LIBRARIES gmock jsoncpp ) -set (SOURCES - json_reader_test.cc -) - -add_library("test_JSONCPPTest" ${SOURCES}) -create_test("test_JSONCPP" "${SOURCES}" "${LIBRARIES}") -endif()
\ No newline at end of file +create_test(jsoncpp_test "${SOURCES}" "${LIBRARIES}") |