diff options
| author | Josh Blum | 2011-08-02 12:48:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-08-02 12:48:35 -0700 |
| commit | 40a9071074b2ec0f6daf74e50e131b89b9f66226 (patch) | |
| tree | 69c995e1955d53ad0cbdfaea15c05a8e819535bf /gnuradio-core | |
| parent | 5a20a73f54a0cc07fffcdb0a259cee7e26fb0ad6 (diff) | |
| parent | 7125a92e1bf7483656af6ef8dcc0be7626a30a82 (diff) | |
| download | gnuradio-40a9071074b2ec0f6daf74e50e131b89b9f66226.tar.gz gnuradio-40a9071074b2ec0f6daf74e50e131b89b9f66226.tar.bz2 gnuradio-40a9071074b2ec0f6daf74e50e131b89b9f66226.zip | |
Merge branch 'next' into digital
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 102e64274..1c133efb9 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -79,7 +79,7 @@ IF(ENABLE_GR_CORE) # Setup CPack components ######################################################################## INCLUDE(GrPackage) -CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "The GNU Radio Core Library") +CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library") CPACK_COMPONENT("core_runtime" GROUP "Core" @@ -131,19 +131,6 @@ ENDIF(ENABLE_PYTHON) # Create Pkg Config File ######################################################################## FILE(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}/gnuradio" includedir) #different from other gr modules -FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_DATA_DIR}/guile/site" guile_load_path) #screw this... - -FOREACH(boost_include ${Boost_INCLUDE_DIRS}) - SET(BOOST_CXXFLAGS "-I${boost_include} ${BOOST_CXXFLAGS}") -ENDFOREACH(boost_include) - -FOREACH(boost_libdir ${Boost_LIBRARY_DIRS}) - SET(BOOST_LDFLAGS "-L${boost_libdir} ${BOOST_LDFLAGS}") -ENDFOREACH(boost_libdir) - -FOREACH(boost_ldflag ${Boost_LIBRARIES}) - SET(BOOST_LDFLAGS "${boost_ldflag} ${BOOST_LDFLAGS}") -ENDFOREACH(boost_ldflag) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in |