Revert "Fix/cmake files refactoring"revert-1144-fix/cmake_files_refactoring

6 files changed, 175 insertions, 111 deletions

diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt
index 51835c125a..f72d43e546 100644
--- a/src/components/utils/CMakeLists.txt
+++ b/src/components/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, Ford Motor Company
+# Copyright (c) 2015, Ford Motor Company
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,77 +28,62 @@
 # 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/platform.cmake)
-include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
 
-find_package(Sqlite3 REQUIRED)
+set(UTILS_INCLUDE_DIR ${COMPONENTS_DIR}/utils/include)
+set(UTILS_SRC_DIR ${COMPONENTS_DIR}/utils/src)
 
 include_directories (
-  ${COMPONENTS_DIR}/utils/include
+  ${UTILS_INCLUDE_DIR}
   ${COMPONENTS_DIR}/config_profile/include
   ${COMPONENTS_DIR}/media_manager/include
   ${COMPONENTS_DIR}/protocol_handler/include
   ${LOG4CXX_INCLUDE_DIRECTORY}
 )
 
-# dbms
-set(DBMS_PATHS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/utils/sqlite_wrapper
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/sqlite_wrapper
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/utils/qdb_wrapper
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/qdb_wrapper
+set (SOURCES
+    ${UTILS_SRC_DIR}/bitstream.cc
+    ${UTILS_SRC_DIR}/conditional_variable_posix.cc
+    ${UTILS_SRC_DIR}/file_system.cc
+    ${UTILS_SRC_DIR}/threads/posix_thread.cc   
+    ${UTILS_SRC_DIR}/threads/thread_delegate.cc
+    ${UTILS_SRC_DIR}/threads/thread_validator.cc
+    ${UTILS_SRC_DIR}/threads/async_runner.cc
+    ${UTILS_SRC_DIR}/lock_posix.cc
+    ${UTILS_SRC_DIR}/rwlock_posix.cc
+    ${UTILS_SRC_DIR}/date_time.cc
+    ${UTILS_SRC_DIR}/signals_linux.cc
+    ${UTILS_SRC_DIR}/system.cc
+    ${UTILS_SRC_DIR}/resource_usage.cc
+    ${UTILS_SRC_DIR}/appenders_loader.cc
+    ${UTILS_SRC_DIR}/gen_hash.cc
+    ${UTILS_SRC_DIR}/convert_utils.cc
+    ${UTILS_SRC_DIR}/custom_string.cc
+    ${UTILS_SRC_DIR}/timer.cc
 )
 
-set(EXCLUDE_PATHS
-  thread_manager.cc
-  pulse_thread_delegate.cc
-  ${DBMS_PATHS}
-)
-
-set(LIBRARIES)
-
-if(NOT BUILD_BACKTRACE_SUPPORT)
-  list(APPEND EXCLUDE_PATHS
-    back_trace.cc
-  )
-endif()
-
 if(ENABLE_LOG)
-  list(APPEND LIBRARIES
-	log4cxx -L${LOG4CXX_LIBS_DIRECTORY}
-    apr-1 -L${APR_LIBS_DIRECTORY}
-    aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY}
-	ConfigProfile
-  )
-else()
-  list(APPEND EXCLUDE_PATHS
-    push_log.cc
-    log_message_loop_thread.cc
-    logger_status.cc
-    auto_trace.cc
-    logger.cc
+  list(APPEND SOURCES
+    ${UTILS_SRC_DIR}/push_log.cc
+    ${UTILS_SRC_DIR}/log_message_loop_thread.cc
+    ${UTILS_SRC_DIR}/logger_status.cc
+    ${UTILS_SRC_DIR}/auto_trace.cc
+    ${UTILS_SRC_DIR}/logger.cc
   )
 endif()
 
-if(NOT BUILD_BT_SUPPORT)
-  list(APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/utils/bluetooth
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/bluetooth
-  )
+if (BUILD_BACKTRACE_SUPPORT)
+    list(APPEND SOURCES
+    ${UTILS_SRC_DIR}/back_trace.cc
+    )
 endif()
 
-if (NOT CMAKE_SYSTEM_NAME STREQUAL "QNX")
-    list(APPEND EXCLUDE_PATHS
-      pulse_thread_delegate.cc
+if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
+    list(APPEND SOURCES
+    ${UTILS_SRC_DIR}/threads/pulse_thread_delegate.cc
     )
 endif()
 
-set(PATHS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/src
-)
-
-collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}")
+add_library("Utils" ${SOURCES})
 
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
     # --- QDB Wrapper 
@@ -109,16 +94,26 @@ else ()
 endif ()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- list(APPEND LIBRARIES dl pthread ${RTLIB}) 
+ list(APPEND LIBRARIES dl) 
 endif()
 
-add_library("Utils" ${SOURCES})
-target_link_libraries("Utils" ${LIBRARIES})
 
 if(ENABLE_LOG)
-  add_dependencies("Utils" install-3rd_party_logger)
+  list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES ConfigProfile)
+
+  ADD_DEPENDENCIES(Utils install-3rd_party_logger)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  target_link_libraries("Utils" pthread ${RTLIB})
+endif()
+
+target_link_libraries("Utils" ${LIBRARIES})
+
+
 if(BUILD_TESTS)
   add_subdirectory(test)
 endif()
diff --git a/src/components/utils/src/qdb_wrapper/CMakeLists.txt b/src/components/utils/src/qdb_wrapper/CMakeLists.txt
new file mode 100644
index 0000000000..c19321568e
--- /dev/null
+++ b/src/components/utils/src/qdb_wrapper/CMakeLists.txt
@@ -0,0 +1,54 @@
+# Copyright (c) 2013, 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.
+
+set(target dbms)
+
+include_directories(${COMPONENTS_DIR}/utils/include/utils)
+
+set(SOURCES
+  ./sql_database.cc
+  ./sql_query.cc
+  ./sql_error.cc
+)
+
+add_library(${target} ${SOURCES})
+target_link_libraries(${target} qdb Utils)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/policy.ini DESTINATION ${CMAKE_BINARY_DIR}/src/appMain)
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/qdbserver.sh DESTINATION ${CMAKE_BINARY_DIR}/src/appMain)
+endif ()
+
+if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
+  install(FILES policy.ini DESTINATION bin)
+  install(FILES qdbserver.sh DESTINATION bin
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif ()
diff --git a/src/components/utils/src/signals_posix.cc b/src/components/utils/src/signals_linux.cc
index 274c254716..274c254716 100644
--- a/src/components/utils/src/signals_posix.cc
+++ b/src/components/utils/src/signals_linux.cc
diff --git a/src/components/utils/src/threads/thread_posix.cc b/src/components/utils/src/threads/posix_thread.cc
index 51e59fa108..51e59fa108 100644
--- a/src/components/utils/src/threads/thread_posix.cc
+++ b/src/components/utils/src/threads/posix_thread.cc
diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index 81e7d15bcb..6ec12a17e6 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -28,8 +28,7 @@
 # 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/platform.cmake)
-include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+if(BUILD_TESTS)
 
 include_directories (
   ${JSONCPP_INCLUDE_DIRECTORY}
@@ -40,61 +39,74 @@ include_directories (
   ${COMPONENTS_DIR}/policy/include
 )
 
-set(EXCLUDE_PATHS
-  qdb_wrapper
-  test_generator
+set(testSources
+  messagemeter_test.cc
+  file_system_test.cc
+  date_time_test.cc
+  system_test.cc
+  thread_validator_test.cc
+  conditional_variable_test.cc
+  message_queue_test.cc
+  resource_usage_test.cc
+  bitstream_test.cc
+  prioritized_queue_test.cc
+  data_accessor_test.cc
+  lock_posix_test.cc
+  singleton_test.cc
+  #posix_thread_test.cc
+  stl_utils_test.cc
+  rwlock_posix_test.cc
+  async_runner_test.cc
+  shared_ptr_test.cc
+  scope_guard_test.cc
+  atomic_object_test.cc
+  message_loop_thread_test.cc
+  custom_string_test.cc
+  timer_test.cc
 )
 
-if(NOT ENABLE_LOG)
-  list(APPEND EXCLUDE_PATHS
-    auto_trace_test.cc
-    log_message_loop_thread_test.cc
-  )
-endif()
-
-if(NOT BUILD_BACKTRACE_SUPPORT)
-  list(APPEND EXCLUDE_PATHS
-    back_trace_test.cc
-  )
-endif()
+set(testLibraries
+  gmock
+  Utils
+  Policy
+  ConfigProfile
+)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
-  # exclude tests for SQLite wrapper
-  list (APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/sqlite_wrapper
+  # --- Tests for QDB Wrapper
+  list (APPEND testSources
+    ./qdb_wrapper/sql_database_test.cc
+    ./qdb_wrapper/sql_query_test.cc
   )
   file(COPY qdbserver.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   file(COPY test-qdb.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
   file(COPY policy.sql DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 else ()
+  # --- Tests for SQLite Wrapper
   find_package(Sqlite3 REQUIRED)
-  # exclude tests for QDB wrapper
-  list (APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/qdb_wrapper
+  list (APPEND testSources
+    ./sqlite_wrapper/sql_database_test.cc
+    ./sqlite_wrapper/sql_query_test.cc
+    generated_code_with_sqlite_test.cc
   )
   list (APPEND testLibraries sqlite3)
 endif()
 
-# exclude some tests
-list(APPEND EXCLUDE_PATHS
-  generated_code_with_sqlite_test.cc
-  posix_thread_test.cc
-  resource_usage_test.cc
-)
-
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}")
-
-set(LIBRARIES
-  gmock
-  Utils
-  Policy
-  ConfigProfile
-)
+if (ENABLE_LOG)
+  list(APPEND testSources auto_trace_test.cc)
+  list(APPEND testSources log_message_loop_thread_test.cc)
+endif()
 
-create_test(utils_test "${SOURCES}" "${LIBRARIES}")
+if (BUILD_BACKTRACE_SUPPORT)
+  list(APPEND testSources back_trace_test.cc)
+endif()
 
 file(COPY testscript.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
+create_test("utils_test" "${testSources}" "${testLibraries}")
+
 add_subdirectory(test_generator)
+
+endif()
diff --git a/src/components/utils/test/test_generator/CMakeLists.txt b/src/components/utils/test/test_generator/CMakeLists.txt
index 5a7f939659..d649f927a5 100644
--- a/src/components/utils/test/test_generator/CMakeLists.txt
+++ b/src/components/utils/test/test_generator/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, Ford Motor Company
+# Copyright (c) 2015, Ford Motor Company
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,35 +28,38 @@
 # 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/generators.cmake)
+if(BUILD_TESTS)
 
 include_directories (
+  ${JSONCPP_INCLUDE_DIRECTORY}
+  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/include
+  ${CMAKE_SOURCE_DIR}/src/3rd_party-static/gmock-1.7.0/gtest/include
   ${CMAKE_SOURCE_DIR}/tools/interfaceGenerator
   ${CMAKE_CURRENT_BINARY_DIR}
   ${COMPONENTS_DIR}/utils/include/utils
   ${COMPONENTS_DIR}/include/utils
-  ${JSONCPP_INCLUDE_DIRECTORY}
-  ${GMOCK_INCLUDE_DIRECTORY}
 )
 
-set(XML_NAME ${CMAKE_SOURCE_DIR}/src/components/interfaces/MOBILE_API.xml)
-add_custom_target(generate_version
-  COMMAND ${INTEFRACE_GENERATOR_CMD} ${XML_NAME} "mobile_apis"
-  ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "sdlrpcv2"
-  DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${XML_NAME}
-  VERBATIM
-)
+set(full_xml_name "${CMAKE_SOURCE_DIR}/src/components/interfaces/MOBILE_API.xml")
 
-set(LIBRARIES
+add_custom_target( generate_version
+                   COMMAND ${INTEFRACE_GENERATOR_CMD} ${full_xml_name} "mobile_apis"
+                   ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "sdlrpcv2"
+                   DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${full_xml_name}
+                   VERBATIM
+                 )
+
+set(testLibraries
   gmock
   Utils
 )
 
-set(SOURCES
+set(testSources
   generated_msg_version_test.cc
 )
 
-create_test(generator_test "${SOURCES}" "${LIBRARIES}")
-file(COPY ${XML_NAME} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
+file(COPY ${full_xml_name} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+create_test("generator_test" "${testSources}" "${testLibraries}")
 add_dependencies("generator_test" generate_version)
+
+endif()