From 8524736fe3c5812b5e8e0a85af45c4775a2d4ca2 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 17 Sep 2011 09:26:19 -0400
Subject: cmake: modified find files to better follow coding guide

http://www.cmake.org/cgi-bin/viewcvs.cgi/Modules/readme.txt?root=CMake&view=markup
---
 gnuradio-core/src/lib/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnuradio-core/src/lib/CMakeLists.txt')

diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index 10752ecd8..17b69d53f 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(${GNURADIO_CORE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-ADD_DEFINITIONS(-DGSL_DLL) #needed for gsl windows port but safe to always define
+ADD_DEFINITIONS(${GSL_DEFINITIONS})
 INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIRS})
 LINK_DIRECTORIES(${GSL_LIBRARY_DIRS})
 
-- 
cgit 


From 9e73c4e8372bc581d686d5e82a808894d41523ec Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 27 Sep 2011 11:56:52 -0700
Subject: core: add link with librt for shm_* calls

---
 gnuradio-core/src/lib/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnuradio-core/src/lib/CMakeLists.txt')

diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index 17b69d53f..c3ce5a145 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -63,6 +63,11 @@ LIST(APPEND gnuradio_core_libs
     ${FFTW3F_LIBRARIES}
 )
 
+#need to link with librt on ubuntu 11.10 for shm_*
+IF(LINUX)
+    LIST(APPEND gnuradio_core_libs rt)
+ENDIF()
+
 ADD_LIBRARY(gnuradio-core SHARED ${gnuradio_core_sources})
 TARGET_LINK_LIBRARIES(gnuradio-core ${gnuradio_core_libs})
 SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES DEFINE_SYMBOL "gnuradio_core_EXPORTS")
-- 
cgit