From ad6d2550d0e728a2927270721ebcd62671f1f0aa Mon Sep 17 00:00:00 2001 From: Sai Sasidhar Maddali Date: Wed, 10 Feb 2016 14:38:34 +0100 Subject: ADD: Runtime installation target for Windows --- plugins/mock/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') 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}) -- cgit v1.2.3 From 6c2c19d1101a043cc0b05065447cc9321ed32ac0 Mon Sep 17 00:00:00 2001 From: Sai Sasidhar Maddali Date: Mon, 15 Feb 2016 12:19:47 +0100 Subject: FIX: Symbol name exported by plugin is causing a recursive call in Windows --- plugins/file/CMakeLists.txt | 1 + plugins/mock/uca-mock-camera.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/file/CMakeLists.txt b/plugins/file/CMakeLists.txt index ab655fb..741ac56 100644 --- a/plugins/file/CMakeLists.txt +++ b/plugins/file/CMakeLists.txt @@ -22,5 +22,6 @@ if (TIFF_FOUND) install(TARGETS ucafile LIBRARY DESTINATION ${UCA_PLUGINDIR} + RUNTIME DESTINATION ${UCA_BINDIR} COMPONENT ${UCA_CAMERA_NAME}) endif () 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 -- cgit v1.2.3 From 61054956f111b2fe18be59efc19e573d3d41efd7 Mon Sep 17 00:00:00 2001 From: Sai Sasidhar Maddali Date: Tue, 15 Mar 2016 15:38:29 +0100 Subject: ADD: Camera Readout mode for benchmark tool MIN: Moved start and stop timers to individual functions so they can be used when appropriately needed MIN: Updated exported symbol name in uca plugin - file --- plugins/file/uca-file-camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/file/uca-file-camera.c b/plugins/file/uca-file-camera.c index 7bb3cb0..b89c5b6 100644 --- a/plugins/file/uca-file-camera.c +++ b/plugins/file/uca-file-camera.c @@ -354,7 +354,7 @@ uca_file_camera_init(UcaFileCamera *self) } G_MODULE_EXPORT GType -uca_camera_get_type (void) +camera_plugin_get_type (void) { return UCA_TYPE_FILE_CAMERA; } -- cgit v1.2.3