aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2017-08-25 22:21:17 +0200
committerFulup Ar Foll <fulup@iot.bzh>2017-08-25 22:21:17 +0200
commit2f6ce99cfed9795d2a68894abddcdc533d9af097 (patch)
treef0366ad5c6e8f392c5b126757e855c5ab359b64d
parente5c437fd9d5ac7e4c83e47f8bc9ea562120d7881 (diff)
Attend to merfe with Master
-rw-r--r--ctl-binding/CMakeLists.txt5
-rw-r--r--ctl-plugin/CMakeLists.txt1
-rw-r--r--nbproject/configurations.xml13
3 files changed, 19 insertions, 0 deletions
diff --git a/ctl-binding/CMakeLists.txt b/ctl-binding/CMakeLists.txt
index 9000f25..161847e 100644
--- a/ctl-binding/CMakeLists.txt
+++ b/ctl-binding/CMakeLists.txt
@@ -52,3 +52,8 @@ PROJECT_TARGET_ADD(afb-controller)
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
)
+ # Define target includes for this target client
+ TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
diff --git a/ctl-plugin/CMakeLists.txt b/ctl-plugin/CMakeLists.txt
index d89e67d..fb2009f 100644
--- a/ctl-plugin/CMakeLists.txt
+++ b/ctl-plugin/CMakeLists.txt
@@ -43,6 +43,7 @@ PROJECT_TARGET_ADD(audio-plugin-sample)
# Library dependencies (include updates automatically)
TARGET_LINK_LIBRARIES(${TARGET_NAME}
afb-utilities
+ afb-controller
${link_libraries}
)
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index a3d914b..172a65b 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -30,6 +30,7 @@
<in>feature_tests.cxx</in>
</df>
</df>
+<<<<<<< Updated upstream
<df name="ctl-binding">
<in>ctl-binding.c</in>
<in>ctl-dispatch.c</in>
@@ -39,6 +40,8 @@
<df name="ctl-plugin">
<in>ctl-plugin-sample.c</in>
</df>
+=======
+>>>>>>> Stashed changes
</df>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
@@ -107,8 +110,12 @@
<Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/afb-controller/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem>
<Elem>CONTROL_SUPPORT_LUA</Elem>
<Elem>CTL_PLUGIN_MAGIC=2468013579</Elem>
+<<<<<<< Updated upstream
<Elem>NATIVE_LINUX</Elem>
<Elem>controller_EXPORTS</Elem>
+=======
+ <Elem>control_afb_EXPORTS</Elem>
+>>>>>>> Stashed changes
</preprocessorList>
</cTool>
</item>
@@ -226,6 +233,7 @@
</item>
<item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4">
</item>
+<<<<<<< Updated upstream
<item path="ctl-binding/ctl-binding.c" ex="false" tool="0" flavor2="0">
<cTool flags="0">
</cTool>
@@ -246,6 +254,8 @@
<cTool flags="0">
</cTool>
</item>
+=======
+>>>>>>> Stashed changes
<folder path="0/build">
<cTool>
<incDir>
@@ -253,6 +263,7 @@
</incDir>
</cTool>
</folder>
+<<<<<<< Updated upstream
<folder path="0/ctl-binding">
<cTool>
<incDir>
@@ -309,6 +320,8 @@
</preprocessorList>
</cTool>
</folder>
+=======
+>>>>>>> Stashed changes
</conf>
</confs>
</configurationDescriptor>