U1DB

Merge lp:~dobey/u1db/allow-multiarch into lp:u1db

  1. allow-multiarch
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Roberto Alsina
Approved revision: 350
Merged at revision: 351
Proposed branch: lp:~dobey/u1db/allow-multiarch
Merge into: lp:u1db
Diff against target: 25 lines (+6/-2)
1 file modified
src/CMakeLists.txt (+6/-2)
To merge this branch: bzr merge lp:~dobey/u1db/allow-multiarch
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+114470@code.launchpad.net

Commit message

Allow specifying a suffix to the lib dir, for multiarch installation

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2012-07-03 15:39:54 +0000
3+++ src/CMakeLists.txt 2012-07-11 17:17:08 +0000
4@@ -1,6 +1,10 @@
5 cmake_minimum_required (VERSION 2.6)
6 project (u1db)
7
8+# Allow specifying the libdir to use for the C library
9+SET (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name.")
10+SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
11+
12 # Allow the developer to select if Dynamic or Static libraries are built
13 OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
14
15@@ -25,8 +29,8 @@
16
17 INSTALL (
18 TARGETS u1db
19- ARCHIVE DESTINATION lib
20- LIBRARY DESTINATION lib
21+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
22+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
23 )
24
25 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/u1db DESTINATION include

Subscribers

People subscribed via source and target branches