[Commit-gnuradio] [gnuradio] 03/05: Sync modtool GrPlatform.cmake with main GNURadio version.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit b12424b70ffb63c9bb08495991242619421169c1
Author: Philip Balister <address@hidden>
Date:   Tue Oct 25 15:04:23 2016 -0400

    Sync modtool GrPlatform.cmake with main GNURadio version.
    
    This picks up a change needed to build OOT modules for OpenEmbedded
    builds that use /lib64 on the target.
    
    Signed-off-by: Philip Balister <address@hidden>
---
 gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake 
b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
index fbbea5f..00a53d0 100644
--- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
+++ b/gr-utils/python/modtool/gr-newmod/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")