From 22b926d4af4e4aab9ae0746d2bfd8625ceadcc9d Mon Sep 17 00:00:00 2001 From: "Ivo Stoilov (GitHub)" Date: Tue, 3 Jan 2017 17:44:15 +0200 Subject: Apply code review comments Remove FindSDLSqlite3 module, replace with FindSqlite3 Remove commented code Fix redundant libraries in resumption test Related tasks APPLINK-30588 APPLINK-30972 --- src/components/resumption/test/CMakeLists.txt | 1 - .../transport_manager/test/raw_message_matcher.cc | 1 - src/components/utils/CMakeLists.txt | 2 +- tools/cmake/modules/FindSDLSqlite3.cmake | 15 --------------- 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 tools/cmake/modules/FindSDLSqlite3.cmake diff --git a/src/components/resumption/test/CMakeLists.txt b/src/components/resumption/test/CMakeLists.txt index a131470cd2..5481d5f80f 100644 --- a/src/components/resumption/test/CMakeLists.txt +++ b/src/components/resumption/test/CMakeLists.txt @@ -49,7 +49,6 @@ set(LIBRARIES Utils Resumption jsoncpp - ConfigProfile ) create_test(resumption_test "${SOURCES}" "${LIBRARIES}") diff --git a/src/components/transport_manager/test/raw_message_matcher.cc b/src/components/transport_manager/test/raw_message_matcher.cc index ae43838be9..00489d7c03 100644 --- a/src/components/transport_manager/test/raw_message_matcher.cc +++ b/src/components/transport_manager/test/raw_message_matcher.cc @@ -31,7 +31,6 @@ */ #include "include/transport_manager/raw_message_matcher.h" -//#include "../../include/protocol/raw_message.h" namespace test { namespace components { diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index 93e11d745b..51835c125a 100644 --- a/src/components/utils/CMakeLists.txt +++ b/src/components/utils/CMakeLists.txt @@ -31,7 +31,7 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake) include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) -find_package(SDLSqlite3 REQUIRED) +find_package(Sqlite3 REQUIRED) include_directories ( ${COMPONENTS_DIR}/utils/include diff --git a/tools/cmake/modules/FindSDLSqlite3.cmake b/tools/cmake/modules/FindSDLSqlite3.cmake deleted file mode 100644 index 1338ef297f..0000000000 --- a/tools/cmake/modules/FindSDLSqlite3.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# - Try to find Sqlite3 -# -# SQLITE3_INCLUDE_DIRECTORY - the Sqlite3 include directory -# SQLITE3_LIBRARIES - the Sqlite3 libraries - -get_os(OS) -if(${OS} STREQUAL "posix") - find_package(Sqlite3 REQUIRED) -elseif(${OS} STREQUAL "win") - get_sdk(SDK) - if(NOT SDK OR NOT ${SDK} STREQUAL "qt") - set(SQLITE3_INCLUDE_DIRECTORY $ENV{SDL_SQLITE_DIR}) - set(SQLITE3_LIBRARIES $ENV{SDL_SQLITE_DIR}/sqlite3.lib) - endif() -endif() -- cgit v1.2.1