diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
| commit | e18891b3d8980445d54528bd6653403385c0671c (patch) | |
| tree | 3fb2481442ae344d8b33e81dd011627f464552a4 /src | |
| parent | 3b524734a29824986ce0344e06cb81527cd266d8 (diff) | |
| parent | 9bdf1616c6f1360658c7a97c0d7e681a932b4ee7 (diff) | |
| download | uca-e18891b3d8980445d54528bd6653403385c0671c.tar.gz uca-e18891b3d8980445d54528bd6653403385c0671c.tar.bz2 uca-e18891b3d8980445d54528bd6653403385c0671c.tar.xz uca-e18891b3d8980445d54528bd6653403385c0671c.zip | |
Merge branch 'dexela'
Conflicts:
plugins/dexela/CMakeLists.txt
src/CMakeLists.txt
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libuca.pc.in (renamed from src/uca.pc.in) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e7db6a7..c3a037f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,8 +53,8 @@ set(libdir ${prefix}/${LIB_INSTALL_DIR}) set(includedir "\${prefix}/include") set(VERSION ${UCA_VERSION_STRING}) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uca.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/uca.pc" @ONLY IMMEDIATE) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libuca.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libuca.pc" @ONLY IMMEDIATE) # --- Build target ------------------------------------------------------------ @@ -201,7 +201,7 @@ install(TARGETS uca LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libuca.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT libraries) diff --git a/src/uca.pc.in b/src/libuca.pc.in index 3ca4dbe..3ca4dbe 100644 --- a/src/uca.pc.in +++ b/src/libuca.pc.in |