summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2016-12-16 14:23:54 +0100
committerGitHub <noreply@github.com>2016-12-16 14:23:54 +0100
commitd92f4ed1f803fba3231d083023712a67eeceada4 (patch)
treec3cf7eafc242bdcb709acfc2d42b0f877dd387c2
parent5a9607603c5a686a72f8449344b573ca263d7fda (diff)
parentb925ab14dfc7d8600c0dd2f2bbcb4639bb40c26e (diff)
downloaduca-net-d92f4ed1f803fba3231d083023712a67eeceada4.tar.gz
uca-net-d92f4ed1f803fba3231d083023712a67eeceada4.tar.bz2
uca-net-d92f4ed1f803fba3231d083023712a67eeceada4.tar.xz
uca-net-d92f4ed1f803fba3231d083023712a67eeceada4.zip
Merge pull request #4 from softwareschneiderei/master
Defined missing paths for correct installation
-rw-r--r--CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 430c969..775312f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${UC
link_directories(${UCA_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS})
# uca-net client camera
+configure_paths(UCANET)
+set(UCANET_PLUGINDIR "${UCANET_LIBDIR}/uca") # TODO: Maybe move this to ConfigurePaths?
add_library(ucanet SHARED uca-net-camera.c)
-target_link_libraries(ucanet ${UCA_LIBRARIES})
+target_link_libraries(ucanet ${UCA_LIBRARIES} ${GIO_LIBRARIES})
-install(TARGETS ucanet LIBRARY DESTINATION ${LIBUCA_PLUGINDIR})
+install(TARGETS ucanet LIBRARY DESTINATION ${UCANET_PLUGINDIR} RUNTIME DESTINATION ${UCANET_PLUGINDIR})
# uca-net server
configure_paths(UCAD)