aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-10-11 12:28:44 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-10-11 12:28:44 +0000
commitfe23ca1a7b011a8ba39e6d2ba1d2cbd80bbd1262 (patch)
treef52fb03a1bd5dda948975bb9ea2fc27da27ee562
parent2ccdc4247c76a8f7768b3744c7083379c13bc80e (diff)
parent16be4fc08c0a77cc64027ed46c80a1cddf570c63 (diff)
Merge "binding: mediaplayer: update version of conf.d/app-templates submodule"
-rw-r--r--binding/CMakeLists.txt5
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake2
3 files changed, 2 insertions, 5 deletions
diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt
index 2df218b..d31e712 100644
--- a/binding/CMakeLists.txt
+++ b/binding/CMakeLists.txt
@@ -27,6 +27,7 @@ PROJECT_TARGET_ADD(afm-mediaplayer-binding)
# Binder exposes a unique public entry point
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+ PREFIX "lib"
LABELS "BINDING"
LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME ${TARGET_NAME}
@@ -35,10 +36,6 @@ PROJECT_TARGET_ADD(afm-mediaplayer-binding)
# Library dependencies (include updates automatically)
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries})
- # installation directory
- INSTALL(TARGETS ${TARGET_NAME}
- LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
-
if(HAVE_4A_FRAMEWORK)
add_definitions(-DHAVE_4A_FRAMEWORK)
endif()
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 8967162dd12bce89f9ae27f5c9bce7b78624e3f
+Subproject 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d88
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 92c7ee1..a2b6b3a 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -42,7 +42,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(CMAKE_BUILD_TYPE "RELEASE")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.