aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2016-08-04 11:35:28 -0700
committerMartin Braun <martin.braun@ettus.com>2016-08-04 11:35:28 -0700
commitd21a7163ed2de9799064bf1ef980c3dac51c7b86 (patch)
tree45bff892bd8d327b6184e34323a9a63fd69fe553
parent0c454df02814fc35400804fc90a97fef80945999 (diff)
parent33fe1f967b0a8d0170afa0f575f70593d4a3f440 (diff)
downloaduhd-d21a7163ed2de9799064bf1ef980c3dac51c7b86.tar.gz
uhd-d21a7163ed2de9799064bf1ef980c3dac51c7b86.tar.bz2
uhd-d21a7163ed2de9799064bf1ef980c3dac51c7b86.zip
Merge branch 'maint'
-rw-r--r--host/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index d6b91fc4c..d45cb7236 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -97,6 +97,10 @@ INCLUDE(UHDPackage) #setup cpack
IF(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
SET(LIB_SUFFIX 64)
ENDIF()
+IF(CMAKE_INSTALL_LIBDIR MATCHES lib64)
+ SET(LIB_SUFFIX 64)
+ENDIF()
+
SET(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix")
SET(RUNTIME_DIR bin)
SET(LIBRARY_DIR lib${LIB_SUFFIX})