diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-28 11:05:45 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-28 11:05:45 -0700 |
| commit | d7f0b3c76e9e913b6c031f570e079ce9aa78a91a (patch) | |
| tree | d27028ef37a636b9b1422642292b9885ae7dbe8b /gr-utils/python/modtool | |
| parent | 66df227f72156ddbc3f8b9321ff507a4e8a91523 (diff) | |
| parent | 1799695dc23d2a9135a7c966cb56c80c08880801 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-utils/python/modtool')
| -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") |