diff options
| author | Mihael Koep <koep@schneide.com> | 2012-09-04 16:07:09 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-09-04 16:07:09 +0200 |
| commit | 2fad826eb9b5ca6a2825193e864545e2d4976966 (patch) | |
| tree | f405ac4be43f2e212d7c7153c18f986c9921b252 | |
| parent | c45a310216bc28a567195ebcc71d9e1cf0f16ba1 (diff) | |
| download | libuca-2fad826eb9b5ca6a2825193e864545e2d4976966.tar.gz libuca-2fad826eb9b5ca6a2825193e864545e2d4976966.tar.bz2 libuca-2fad826eb9b5ca6a2825193e864545e2d4976966.tar.xz libuca-2fad826eb9b5ca6a2825193e864545e2d4976966.zip | |
Implement 64bit detection for install directory of libuca.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ade68ad..4f7ef43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket") set(CPACK_GENERATOR "DEB;RPM;") -set(CPACK_PACKAGE_RELEASE 3) +set(CPACK_PACKAGE_RELEASE 4) set(CPACK_DEBIAN_PACKAGE_NAME "libuca") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94de82d..c318d52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -264,7 +264,12 @@ endif() # --- Install target ---------------------------------------------------------- -set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}") +# check for 64 bit +if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(LIB_INSTALL_DIR "lib64") +else() + set(LIB_INSTALL_DIR "lib") +endif() install(TARGETS uca LIBRARY DESTINATION ${LIB_INSTALL_DIR}) |