summaryrefslogtreecommitdiffstats
path: root/plugins/mock
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2016-03-15 16:02:59 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2016-03-15 16:02:59 +0100
commitf0d736e94d16921c2cbf2081baf9296c967cbe1d (patch)
tree2fccc4bbb815d90ec6d18c18782cc46775e90a3b /plugins/mock
parentf8d3dc2c2372b79c76d313696e98f9b2932f9ea6 (diff)
parent61054956f111b2fe18be59efc19e573d3d41efd7 (diff)
downloaduca-f0d736e94d16921c2cbf2081baf9296c967cbe1d.tar.gz
uca-f0d736e94d16921c2cbf2081baf9296c967cbe1d.tar.bz2
uca-f0d736e94d16921c2cbf2081baf9296c967cbe1d.tar.xz
uca-f0d736e94d16921c2cbf2081baf9296c967cbe1d.zip
Merge pull request #75 from saisasidhar/master
Building libuca for Windows
Diffstat (limited to 'plugins/mock')
-rw-r--r--plugins/mock/CMakeLists.txt1
-rw-r--r--plugins/mock/uca-mock-camera.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mock/CMakeLists.txt b/plugins/mock/CMakeLists.txt
index 5cb1067..a53c071 100644
--- a/plugins/mock/CMakeLists.txt
+++ b/plugins/mock/CMakeLists.txt
@@ -17,4 +17,5 @@ target_link_libraries(ucamock uca m ${UCA_DEPS})
install(TARGETS ucamock
LIBRARY DESTINATION ${UCA_PLUGINDIR}
+ RUNTIME DESTINATION ${UCA_BINDIR}
COMPONENT ${UCA_CAMERA_NAME})
diff --git a/plugins/mock/uca-mock-camera.c b/plugins/mock/uca-mock-camera.c
index ad300d2..e6892cb 100644
--- a/plugins/mock/uca-mock-camera.c
+++ b/plugins/mock/uca-mock-camera.c
@@ -557,7 +557,7 @@ uca_mock_camera_init(UcaMockCamera *self)
}
G_MODULE_EXPORT GType
-uca_camera_get_type (void)
+camera_plugin_get_type (void)
{
return UCA_TYPE_MOCK_CAMERA;
-}
+} \ No newline at end of file