summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Stoilov (GitHub) <istoilov@luxoft.com>2017-01-11 15:36:07 +0200
committerIvo Stoilov (GitHub) <istoilov@luxoft.com>2017-01-12 18:36:30 +0200
commitbf037abe0111bba48368b121d67dfa32c4837947 (patch)
tree337f32f472c33f039dc24a620ae4debf56669291
parent1c58e66069fe65a94234e322cd76051e0aaa30e2 (diff)
downloadsdl_core-bf037abe0111bba48368b121d67dfa32c4837947.tar.gz
Fix policy tests crash
Remove library causing issue Putback some files removed by mistake Related tasks APPLINK-30588 APPLINK-30972
-rw-r--r--src/3rd_party/iap.build.tar.bz2bin0 -> 19659 bytes
-rw-r--r--src/components/policy/test/CMakeLists.txt3
-rw-r--r--src/components/utils/src/qdb_wrapper/CMakeLists.txt54
3 files changed, 55 insertions, 2 deletions
diff --git a/src/3rd_party/iap.build.tar.bz2 b/src/3rd_party/iap.build.tar.bz2
new file mode 100644
index 0000000000..19aa8b7ae5
--- /dev/null
+++ b/src/3rd_party/iap.build.tar.bz2
Binary files differ
diff --git a/src/components/policy/test/CMakeLists.txt b/src/components/policy/test/CMakeLists.txt
index 4f6abf2992..7afde360a1 100644
--- a/src/components/policy/test/CMakeLists.txt
+++ b/src/components/policy/test/CMakeLists.txt
@@ -42,11 +42,10 @@ include_directories(
${COMPONENTS_DIR}/policy/test/include/
)
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}")
+collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}")
set(LIBRARIES
gmock
- dbms
Utils
Policy
UsageStatistics
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 ()