[hamradio-commits] [gnss-sdr] 21/149: Change according to https://github.com/gnuradio/gnuradio/commit/dec480ab3f0809677ba3ef2a3a64d402d742b5ec

[Carles Fernandez]

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

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 1b16fb6dfb0de625513af4b8311a7736fbc143f7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Dec 30 08:15:24 2015 +0100

    Change according to
    https://github.com/gnuradio/gnuradio/commit/dec480ab3f0809677ba3ef2a3a64d402d742b5ec
---
 drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake | 8 ++++++--
 drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake    | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake b/drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake
index a2e4f3b..2c3e5ab 100644
--- a/drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake
+++ b/drivers/gr-dbfcttc/cmake/Modules/GrPlatform.cmake
@@ -29,14 +29,18 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(LINUX TRUE)
 endif()
 
-if(LINUX AND EXISTS "/etc/debian_version")
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/debian_version")
     set(DEBIAN TRUE)
 endif()
 
-if(LINUX AND EXISTS "/etc/redhat-release")
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/redhat-release")
     set(REDHAT TRUE)
 endif()
 
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/slackware-version")
+    set(SLACKWARE TRUE)
+endif()
+
 ########################################################################
 # when the library suffix should be 64 (applies to redhat linux family)
 ########################################################################
diff --git a/drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake b/drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake
index 5b7e886..fbbea5f 100644
--- a/drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake
+++ b/drivers/gr-gn3s/cmake/Modules/GrPlatform.cmake
@@ -29,15 +29,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(LINUX TRUE)
 endif()
 
-if(LINUX AND EXISTS "/etc/debian_version")
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/debian_version")
     set(DEBIAN TRUE)
 endif()
 
-if(LINUX AND EXISTS "/etc/redhat-release")
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/redhat-release")
     set(REDHAT TRUE)
 endif()
 
-if(LINUX AND EXISTS "/etc/slackware-version")
+if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/slackware-version")
     set(SLACKWARE TRUE)
 endif()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git