[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/05: Use CMAKE_INSTALL_LIBDIR to set LIB_
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/05: Use CMAKE_INSTALL_LIBDIR to set LIB_SUFFIX. |
Date: |
Fri, 28 Oct 2016 18:55:44 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 678289e5e8eb7126e6a95c3ffcbd7d555da2b733
Author: Philip Balister <address@hidden>
Date: Thu Aug 4 08:20:55 2016 -0400
Use CMAKE_INSTALL_LIBDIR to set LIB_SUFFIX.
OpenEmbedded sets this variable for builds, so use it to figure out if
the build should install into the lib64 directories.
Signed-off-by: Philip Balister <address@hidden>
---
cmake/Modules/GrPlatform.cmake | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/cmake/Modules/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake
index fbbea5f..00a53d0 100644
--- a/cmake/Modules/GrPlatform.cmake
+++ b/cmake/Modules/GrPlatform.cmake
@@ -51,4 +51,12 @@ endif()
if(NOT DEFINED LIB_SUFFIX AND LIB64_CONVENTION AND CMAKE_SYSTEM_PROCESSOR
MATCHES "64$")
set(LIB_SUFFIX 64)
endif()
+
+########################################################################
+# Detect /lib versus /lib64
+########################################################################
+if (CMAKE_INSTALL_LIBDIR MATCHES lib64)
+ set(LIB_SUFFIX 64)
+endif()
+
set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix")