diff options
| author | Johnathan Corgan | 2012-03-12 09:58:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-12 09:58:01 -0700 |
| commit | 2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec (patch) | |
| tree | aed69a9c702f3f4b15eda07c0e50ce6162dbf896 | |
| parent | bbfe6d614e38ceb0fe8efbe8a5927d92ca9c72b1 (diff) | |
| parent | 7a3a0b531c79925b8ea291471534e5a1c2693ba8 (diff) | |
| download | gnuradio-2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec.tar.gz gnuradio-2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec.tar.bz2 gnuradio-2d54dd698f1ec9574e54e6a31bc7356abdd3e4ec.zip | |
Merge branch 'master' into next
| -rw-r--r-- | cmake/Modules/GrPlatform.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/Modules/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake index ce2e15fef..dde65cee5 100644 --- a/cmake/Modules/GrPlatform.cmake +++ b/cmake/Modules/GrPlatform.cmake @@ -37,10 +37,18 @@ if(LINUX AND EXISTS "/etc/redhat-release") set(REDHAT TRUE) endif() +if(LINUX AND EXISTS "/etc/slackware-version") + set(SLACKWARE TRUE) +endif() + ######################################################################## # when the library suffix should be 64 (applies to redhat linux family) ######################################################################## -if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$") +if (REDHAT OR SLACKWARE) + set(LIB64_CONVENTION TRUE) +endif() + +if(NOT DEFINED LIB_SUFFIX AND LIB64_CONVENTION AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$") set(LIB_SUFFIX 64) endif() set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix") |