1 files changed, 55 insertions, 45 deletions
diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index 68a8981547..efa93e3442 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -28,45 +28,67 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-if(BUILD_TESTS)
-
 set(UTILS_TEST_DIR ${COMPONENTS_DIR}/utils/test)
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  find_package(WinSqlite3 REQUIRED)
+  if (NOT QT_PORT)
+    link_directories ($ENV{SDL_SQLITE_DIR})
+  endif()
+else()
+  find_package(Sqlite3 REQUIRED)
+endif()
+
 include_directories (
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/utils/include
+  ${COMPONENTS_DIR}/policy/include
   ${COMPONENTS_DIR}/rpc_base/include
   ${COMPONENTS_DIR}/utils/test/include
-  ${COMPONENTS_DIR}/policy/include
+  ${SQLITE_INCLUDE_DIRECTORY}
 )
 
 set(testSources
-  ${UTILS_TEST_DIR}/messagemeter_test.cc
-  ${UTILS_TEST_DIR}/file_system_test.cc
-  ${UTILS_TEST_DIR}/date_time_test.cc
-  ${UTILS_TEST_DIR}/system_test.cc
-  ${UTILS_TEST_DIR}/thread_validator_test.cc
-  ${UTILS_TEST_DIR}/conditional_variable_test.cc
-  ${UTILS_TEST_DIR}/message_queue_test.cc
-  ${UTILS_TEST_DIR}/resource_usage_test.cc
-  ${UTILS_TEST_DIR}/bitstream_test.cc
-  ${UTILS_TEST_DIR}/prioritized_queue_test.cc
-  ${UTILS_TEST_DIR}/data_accessor_test.cc
-  ${UTILS_TEST_DIR}/lock_posix_test.cc
-  ${UTILS_TEST_DIR}/singleton_test.cc
-#  ${UTILS_TEST_DIR}/posix_thread_test.cc
-  ${UTILS_TEST_DIR}/stl_utils_test.cc
-  ${UTILS_TEST_DIR}/rwlock_posix_test.cc
-  ${UTILS_TEST_DIR}/async_runner_test.cc
-  ${UTILS_TEST_DIR}/shared_ptr_test.cc
-  ${UTILS_TEST_DIR}/scope_guard_test.cc
-  ${UTILS_TEST_DIR}/atomic_object_test.cc
-  ${UTILS_TEST_DIR}/message_loop_thread_test.cc
-  ${UTILS_TEST_DIR}/custom_string_test.cc
-  ${UTILS_TEST_DIR}/timer_test.cc
+  messagemeter_test.cc
+  file_system_test.cc
+  date_time_test.cc
+  thread_validator_test.cc
+  bitstream_test.cc
+  prioritized_queue_test.cc
+  data_accessor_test.cc
+  stl_utils_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
+  lock_test.cc
+  thread_test.cc
 )
 
+if (ENABLE_LOG)
+  list(APPEND testSources auto_trace_test.cc)
+endif()
+
+if (BUILD_BACKTRACE_SUPPORT)
+  list(APPEND testSources back_trace_test.cc)
+endif()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  list (APPEND testSources
+    system_test.cc
+    conditional_variable_test.cc
+    message_queue_test.cc
+    singleton_test.cc
+    rwlock_posix_test.cc
+    resource_usage_test.cc
+  )
+
+endif()
+
 set(testLibraries
   gmock
   Utils
@@ -80,12 +102,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
     ${UTILS_TEST_DIR}/qdb_wrapper/sql_database_test.cc
     ${UTILS_TEST_DIR}/qdb_wrapper/sql_query_test.cc
   )
-  file(COPY ${UTILS_TEST_DIR}/qdbserver.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${UTILS_TEST_DIR}/test-qdb.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  file(COPY ${UTILS_TEST_DIR}/policy.sql DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-else ()
+  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})
+elseif(NOT QT_PORT)
   # --- Tests for SQLite Wrapper
-  find_package(Sqlite3 REQUIRED)
   list (APPEND testSources
     ${UTILS_TEST_DIR}/sqlite_wrapper/sql_database_test.cc
     ${UTILS_TEST_DIR}/sqlite_wrapper/sql_query_test.cc
@@ -94,21 +115,10 @@ else ()
   list (APPEND testLibraries sqlite3)
 endif()
 
-if (ENABLE_LOG)
-  list(APPEND testSources ${UTILS_TEST_DIR}/auto_trace_test.cc)
-  list(APPEND testSources ${UTILS_TEST_DIR}/log_message_loop_thread_test.cc)
-endif()
-
-if (BUILD_BACKTRACE_SUPPORT)
-  list(APPEND testSources ${UTILS_TEST_DIR}/back_trace_test.cc)
-endif()
-
-file(COPY ${UTILS_TEST_DIR}/testscript.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ${UTILS_TEST_DIR}/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ${UTILS_TEST_DIR}/smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+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()