diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-29 09:05:51 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2013-10-29 09:05:51 +0100 |
| commit | 137f03b9a34fb39e5321524ab11fa31276458476 (patch) | |
| tree | 83ea6e2b2228d1e99a37a0e510faaa13130ef849 /bin | |
| parent | 85a0f33711fd4467b9027da85ab9e09e406398d4 (diff) | |
| download | uca-137f03b9a34fb39e5321524ab11fa31276458476.tar.gz uca-137f03b9a34fb39e5321524ab11fa31276458476.tar.bz2 uca-137f03b9a34fb39e5321524ab11fa31276458476.tar.xz uca-137f03b9a34fb39e5321524ab11fa31276458476.zip | |
Use ConfigurePaths to get installation paths
The advantage is twofold: 1) we have a clear separation between setting up the
paths and actually using them, 2) the interface is very likely as configure
scripts and makes integration into build system a bit easier.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/gui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | bin/gui/config.h.in | 2 | ||||
| -rw-r--r-- | bin/tools/CMakeLists.txt | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/bin/gui/CMakeLists.txt b/bin/gui/CMakeLists.txt index bb5a8f4..a75b5b1 100644 --- a/bin/gui/CMakeLists.txt +++ b/bin/gui/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 2.6) +#{{{ Variables +set(UCA_GLADEDIR "${UCA_DATADIR}/libuca") +#}}} #{{{ Configure find_package(PkgConfig) @@ -32,9 +35,9 @@ if (GTK2_FOUND) ${GTHREAD2_LIBRARIES}) install(TARGETS ${BINARY} - RUNTIME DESTINATION bin) + RUNTIME DESTINATION ${UCA_BINDIR}) install(FILES control.glade - DESTINATION share/libuca) + DESTINATION ${UCA_GLADEDIR}) endif() #}}} diff --git a/bin/gui/config.h.in b/bin/gui/config.h.in index e7de9c6..566a405 100644 --- a/bin/gui/config.h.in +++ b/bin/gui/config.h.in @@ -1 +1 @@ -#define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" +#define CONTROL_GLADE_PATH "${UCA_GLADE_DIR}/control.glade" diff --git a/bin/tools/CMakeLists.txt b/bin/tools/CMakeLists.txt index 285b2d7..964b1f9 100644 --- a/bin/tools/CMakeLists.txt +++ b/bin/tools/CMakeLists.txt @@ -32,8 +32,8 @@ target_link_libraries(uca-grab ringbuffer ${libs}) add_executable(uca-benchmark benchmark.c common.c) target_link_libraries(uca-benchmark ${libs}) +#}}} install(TARGETS uca-benchmark uca-grab uca-gen-doc - RUNTIME DESTINATION bin) -#}}} + RUNTIME DESTINATION ${UCA_BINDIR}) #}}} |