diff options
| author | Philip Balister <philip@balister.org> | 2016-10-25 15:04:23 -0400 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2016-10-25 15:04:23 -0400 |
| commit | b12424b70ffb63c9bb08495991242619421169c1 (patch) | |
| tree | b43d7b92204f5609a15f3549fd0d1bce5d6cd17c | |
| parent | 678289e5e8eb7126e6a95c3ffcbd7d555da2b733 (diff) | |
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 <philip@balister.org>
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
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 fbbea5fee0..00a53d04d9 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") |