diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-30 18:51:41 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-30 18:51:41 +0000 |
| commit | 01050cce26a912aad153844a74aae618212c847b (patch) | |
| tree | 834835cb35b48676941565fe03055b463dc9e351 /cpp/BuildInstallSettings.cmake | |
| parent | 69cc27430ae63925308270a7446a83fd7b5e314d (diff) | |
| download | qpid-python-01050cce26a912aad153844a74aae618212c847b.tar.gz | |
NO-JIRA: shamelessly stole some cmake improvements from proton:
- Don't generate the docs all the time (unless we have to)
- Take a guess as to whether to use lib or lib64 to install libraries
(This can be overridden in distribution package builds)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1403812 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/BuildInstallSettings.cmake')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index 6bd883e754..23cc24c96c 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/cpp/BuildInstallSettings.cmake @@ -132,6 +132,16 @@ function(set_absolute_install_path var input) endif () endfunction(set_absolute_install_path) +# Figure out the default library suffix +if (NOT DEFINED LIB_SUFFIX) + get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) + if (${LIB64} STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8") + set(LIB_SUFFIX 64) + else() + set(LIB_SUFFIX "") + endif() +endif() + # In rpm builds the build sets some variables: # CMAKE_INSTALL_PREFIX - this is a standard cmake variable # INCLUDE_INSTALL_DIR @@ -141,7 +151,7 @@ endfunction(set_absolute_install_path) # So make these cached variables and the specific variables non cached and # derived from them. set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory") - set (LIB_INSTALL_DIR lib CACHE PATH "Library object file directory") + set (LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Library object file directory") set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory") set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory") set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory") |