commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 03/07: cmake: Use APPLE, not matching Darwi


From: git
Subject: [Commit-gnuradio] [gnuradio] 03/07: cmake: Use APPLE, not matching Darwin
Date: Mon, 13 Oct 2014 21:00:46 +0000 (UTC)

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 070887e47a0822771d0addef14e81b803f2a5093
Author: Michael Dickens <address@hidden>
Date:   Wed Sep 24 13:54:00 2014 -0400

    cmake: Use APPLE, not matching Darwin
---
 gr-wavelet/lib/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index 85eab28..be2a7a8 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012,2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -45,7 +45,6 @@ endif(ENABLE_GR_CTRLPORT)
 include_directories(${LOG4CPP_INCLUDE_DIRS})
 link_directories(${LOG4CPP_LIBRARY_DIRS})
 
-
 ########################################################################
 # Setup library
 ########################################################################
@@ -82,7 +81,7 @@ add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources})
 target_link_libraries(gnuradio-wavelet ${wavelet_libs})
 
 # we need -no-as-needed or else -lgslcblas gets stripped out on newer version 
of gcc
-if(CMAKE_COMPILER_IS_GNUCC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(CMAKE_COMPILER_IS_GNUCC AND NOT APPLE)
     SET_TARGET_PROPERTIES(gnuradio-wavelet PROPERTIES LINK_FLAGS 
"-Wl,--no-as-needed")
 endif()
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]