aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2016-08-04 10:41:16 -0400
committerMartin Braun <martin.braun@ettus.com>2016-08-04 11:35:12 -0700
commit33fe1f967b0a8d0170afa0f575f70593d4a3f440 (patch)
treeaf700a4d03a86e81a36147d96bd66bea5657231b
parentc10c9d515d9dcba5a66a84598b59ed7bd94f71df (diff)
downloaduhd-33fe1f967b0a8d0170afa0f575f70593d4a3f440.tar.gz
uhd-33fe1f967b0a8d0170afa0f575f70593d4a3f440.tar.bz2
uhd-33fe1f967b0a8d0170afa0f575f70593d4a3f440.zip
Fix lib64 detection for cross builds.
OpenEmbedded sets CMAKE_INSTALL_LIBDIR so we can directly detect if the target wants to install uhd in the lib64 directory. Signed-off-by: Philip Balister <philip@opensdr.com>
-rw-r--r--host/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 12cb91645..9534dd7cd 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -48,6 +48,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})