aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Krysik <ptrkrysik@gmail.com>2016-02-17 12:11:02 +0100
committerPiotr Krysik <ptrkrysik@gmail.com>2016-02-17 12:11:02 +0100
commit89cac10318884777423811e5569dfdb7b4db1c94 (patch)
tree536220c3d34031d618a2549d4d6882894856f671
parent5c7a578e4fd8a55e7db15788a6cc6a04486e2a34 (diff)
Removed redundant "gnuradio" from the grgsm library's name
-rw-r--r--cmake/Modules/gr-gsmConfig.cmake2
-rw-r--r--swig/CMakeLists.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/cmake/Modules/gr-gsmConfig.cmake b/cmake/Modules/gr-gsmConfig.cmake
index e1270f6..f8a2fec 100644
--- a/cmake/Modules/gr-gsmConfig.cmake
+++ b/cmake/Modules/gr-gsmConfig.cmake
@@ -13,7 +13,7 @@ FIND_PATH(
FIND_LIBRARY(
GR_GSM_LIBRARIES
- NAMES gnuradio-grgsm
+ NAMES grgsm
HINTS $ENV{GR_GSM_DIR}/lib
${PC_GR_GSM_LIBDIR}
PATHS ${CMAKE_INSTALL_PREFIX}/lib
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 22d7340..1c237c8 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -40,8 +40,9 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
endforeach(incdir)
+list(APPEND GR_SWIG_INCLUDE_DIRS ${FFTW3F_INCLUDE_DIRS})
-set(GR_SWIG_LIBRARIES gnuradio-grgsm)
+set(GR_SWIG_LIBRARIES grgsm)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i)
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)