diff options
Diffstat (limited to 'comms/gnuradio/files/patch-CMakeLists.txt')
| -rw-r--r-- | comms/gnuradio/files/patch-CMakeLists.txt | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt index 7c632e9c4e05..38207a4445c8 100644 --- a/comms/gnuradio/files/patch-CMakeLists.txt +++ b/comms/gnuradio/files/patch-CMakeLists.txt @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2013-06-04 11:21:38.000000000 -0500 -+++ CMakeLists.txt 2013-06-04 14:46:17.000000000 -0500 -@@ -104,6 +104,14 @@ +--- CMakeLists.txt.orig 2013-11-09 15:25:45.000000000 -0500 ++++ CMakeLists.txt 2014-02-11 20:23:20.000000000 -0500 +@@ -108,6 +108,14 @@ ######################################################################## include(GrPlatform) #define LIB_SUFFIX set(GR_RUNTIME_DIR bin) +######################################################################## -+# FreeBSD needs libiconv -+######################################################################## ++# FreeBSD libdata vs. lib ++# +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +set(GR_PKGCONFIG_DIR libdata${LIB_SUFFIX}) +else() @@ -15,30 +15,49 @@ set(GR_LIBRARY_DIR lib${LIB_SUFFIX}) set(GR_INCLUDE_DIR include) set(GR_DATA_DIR share) -@@ -151,6 +159,22 @@ +@@ -163,6 +171,41 @@ ) ######################################################################## -+# FreeBSD needs libiconv ++# FreeBSD iconv +######################################################################## +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + message( "-- Adding iconv for FreeBSD") + ++ set (ICONV_INCLUDE_DIR ${ICONV_PREFIX}/include) ++ if (${ICONV_LIB} STREQUAL "X-liconv") ++ find_library(ICONV_LIBRARY ++ NAMES iconv ++ PATHS ${ICONV_PREFIX}/lib ++ ) ++ else() ++ find_library(ICONV_LIBRARY ++ NAMES c ++ PATHS ${ICONV_PREFIX}/lib ++ ) ++ endif() ++ ++message ("-- LIBICONV_PLUG = ${LIBICONV_PLUG}") ++message ("-- ICONV_PREFIX = ${ICONV_PREFIX}") ++message ("-- ICONV_INCLUDE_DIRS = ${ICONV_INCLUDE_DIRS}") ++message ("-- ICONV_INCLUDE_DIR = ${ICONV_INCLUDE_DIR}") ++message ("-- ICONV_LIB_DIRS = ${ICONV_LIB_DIRS}") ++message ("-- ICONV_LIBRARY = ${ICONV_LIBRARY}") ++else() + find_path(ICONV_INCLUDE_DIR + NAMES iconv.h -+ PATHS /usr/local/include ${ICONV_INCLUDE_DIRS} ++ PATHS ${ICONV_INCLUDE_DIRS} + ) -+ + find_library(ICONV_LIBRARY + NAMES iconv -+ PATHS /usr/local/lib ${ICONV_LIB_DIRS} ++ PATHS ${ICONV_LIB_DIRS} + ) +endif() +######################################################################## # Enable python component ######################################################################## - find_package(PythonLibs) -@@ -235,11 +259,13 @@ + find_package(PythonLibs 2) +@@ -247,11 +290,13 @@ ######################################################################## # Distribute the README file ######################################################################## |