diff options
author | Josh Blum | 2011-10-08 17:11:12 -0700 |
---|---|---|
committer | Josh Blum | 2011-10-08 17:11:12 -0700 |
commit | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (patch) | |
tree | 046d89555243ede65bfc7bc0a6cbfc7f870ff4cb /gr-qtgui | |
parent | 63b87bf4e6e9a2f1112c17c57796b69b3b8a2b3e (diff) | |
download | gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.tar.gz gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.tar.bz2 gnuradio-71c0f14a46f85027b95f2f5f6d3d219cc9e3783e.zip |
gr: the CMakeLists.txt took a chill pill
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/CMakeLists.txt | 36 | ||||
-rw-r--r-- | gr-qtgui/grc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gr-qtgui/lib/CMakeLists.txt | 40 | ||||
-rw-r--r-- | gr-qtgui/python/CMakeLists.txt | 20 | ||||
-rw-r--r-- | gr-qtgui/swig/CMakeLists.txt | 10 |
5 files changed, 55 insertions, 55 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 280d856af..3b522fb59 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -20,22 +20,22 @@ ######################################################################## # Setup dependencies ######################################################################## -INCLUDE(GrBoost) +include(GrBoost) -FIND_PACKAGE(Qt4 4.2.0 COMPONENTS QtCore QtGui) -INCLUDE(${QT_USE_FILE}) #sets up the environment +find_package(Qt4 4.2.0 COMPONENTS QtCore QtGui) +include(${QT_USE_FILE}) #sets up the environment -FIND_PACKAGE(Qwt) +find_package(Qwt) -FIND_PACKAGE(PythonLibs) +find_package(PythonLibs) -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND) ######################################################################## # Register component ######################################################################## -INCLUDE(GrComponent) +include(GrComponent) GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI Boost_FOUND QT4_FOUND @@ -53,12 +53,12 @@ GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS ######################################################################## # Begin conditional configuration ######################################################################## -IF(ENABLE_GR_QTGUI) +if(ENABLE_GR_QTGUI) ######################################################################## # Setup CPack components ######################################################################## -INCLUDE(GrPackage) +include(GrPackage) CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "GNU Radio QtGUI Blocks") CPACK_COMPONENT("qtgui_runtime" @@ -92,25 +92,25 @@ CPACK_COMPONENT("qtgui_swig" ######################################################################## # Add subdirectories ######################################################################## -ADD_SUBDIRECTORY(lib) -IF(ENABLE_PYTHON) - ADD_SUBDIRECTORY(grc) - ADD_SUBDIRECTORY(swig) - ADD_SUBDIRECTORY(python) -ENDIF(ENABLE_PYTHON) +add_subdirectory(lib) +if(ENABLE_PYTHON) + add_subdirectory(grc) + add_subdirectory(swig) + add_subdirectory(python) +endif(ENABLE_PYTHON) ######################################################################## # Create Pkg Config File ######################################################################## -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-qtgui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc @ONLY) -INSTALL( +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc DESTINATION ${GR_LIBRARY_DIR}/pkgconfig COMPONENT "qtgui_devel" ) -ENDIF(ENABLE_GR_QTGUI) +endif(ENABLE_GR_QTGUI) diff --git a/gr-qtgui/grc/CMakeLists.txt b/gr-qtgui/grc/CMakeLists.txt index 023c38b01..370a71725 100644 --- a/gr-qtgui/grc/CMakeLists.txt +++ b/gr-qtgui/grc/CMakeLists.txt @@ -18,5 +18,5 @@ # Boston, MA 02110-1301, USA. ######################################################################## -FILE(GLOB xml_files "*.xml") -INSTALL(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python") +file(GLOB xml_files "*.xml") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python") diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index 5bc67573e..6cd9e200a 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup the QT file generations stuff ######################################################################## -SET(qtgui_moc_hdrs +set(qtgui_moc_hdrs spectrumdisplayform.h timedisplayform.h FrequencyDisplayPlot.h @@ -33,12 +33,12 @@ QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) #FIXME the sources expect <foo>.ui.h, but the macros generate ui_foo.h #avoid changing the sources by generating the header with the include -SET(spectrum_ui_hdr ${CMAKE_CURRENT_BINARY_DIR}/spectrumdisplayform.ui.h) -IF(NOT EXISTS ${spectrum_ui_hdr}) - FILE(WRITE ${spectrum_ui_hdr} "#include <ui_spectrumdisplayform.h>\n") -ENDIF(NOT EXISTS ${spectrum_ui_hdr}) +set(spectrum_ui_hdr ${CMAKE_CURRENT_BINARY_DIR}/spectrumdisplayform.ui.h) +if(NOT EXISTS ${spectrum_ui_hdr}) + file(WRITE ${spectrum_ui_hdr} "#include <ui_spectrumdisplayform.h>\n") +endif(NOT EXISTS ${spectrum_ui_hdr}) -SET(qtgui_srcs +set(qtgui_srcs ${qtgui_moc_srcs} ${qtgui_ui_hdrs} FrequencyDisplayPlot.cc @@ -61,37 +61,37 @@ SET(qtgui_srcs ######################################################################## # Setup the include and linker paths ######################################################################## -INCLUDE_DIRECTORIES( +include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) -INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) -LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +include_directories(${Boost_INCLUDE_DIRS}) +link_directories(${Boost_LIBRARY_DIRS}) -INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIRS}) -LINK_DIRECTORIES(${QWT_LIBRARY_DIRS}) +include_directories(${QWT_INCLUDE_DIRS}) +link_directories(${QWT_LIBRARY_DIRS}) -INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) +include_directories(${PYTHON_INCLUDE_DIRS}) ######################################################################## # Setup library ######################################################################## -LIST(APPEND qtgui_libs +list(APPEND qtgui_libs gnuradio-core ${QT_LIBRARIES} ${QWT_LIBRARIES} ${PYTHON_LIBRARIES} ) -ADD_DEFINITIONS(-DQWT_DLL) #setup QWT library linkage -ADD_LIBRARY(gnuradio-qtgui SHARED ${qtgui_srcs}) -TARGET_LINK_LIBRARIES(gnuradio-qtgui ${qtgui_libs}) -SET_TARGET_PROPERTIES(gnuradio-qtgui PROPERTIES DEFINE_SYMBOL "libgnuradio_qtgui_EXPORTS") -SET_TARGET_PROPERTIES(gnuradio-qtgui PROPERTIES SOVERSION ${LIBVER}) +add_definitions(-DQWT_DLL) #setup QWT library linkage +add_library(gnuradio-qtgui SHARED ${qtgui_srcs}) +target_link_libraries(gnuradio-qtgui ${qtgui_libs}) +set_target_properties(gnuradio-qtgui PROPERTIES DEFINE_SYMBOL "libgnuradio_qtgui_EXPORTS") +set_target_properties(gnuradio-qtgui PROPERTIES SOVERSION ${LIBVER}) -INSTALL(TARGETS gnuradio-qtgui +install(TARGETS gnuradio-qtgui LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "qtgui_runtime" # .so/.dylib file ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "qtgui_devel" # .lib file RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "qtgui_runtime" # .dll file @@ -100,7 +100,7 @@ INSTALL(TARGETS gnuradio-qtgui ######################################################################## # Install the header files ######################################################################## -INSTALL(FILES +install(FILES FrequencyDisplayPlot.h TimeDomainDisplayPlot.h WaterfallDisplayPlot.h diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt index e80fa6b75..e61b54f08 100644 --- a/gr-qtgui/python/CMakeLists.txt +++ b/gr-qtgui/python/CMakeLists.txt @@ -18,7 +18,7 @@ # Boston, MA 02110-1301, USA. ######################################################################## -INCLUDE(GrPython) +include(GrPython) GR_PYTHON_INSTALL( FILES __init__.py @@ -29,18 +29,18 @@ GR_PYTHON_INSTALL( ######################################################################## # Handle the unit tests ######################################################################## -IF(ENABLE_TESTING) -INCLUDE(GrTest) -FILE(GLOB py_qa_test_files "qa_*.py") -FOREACH(py_qa_test_file ${py_qa_test_files}) - GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE) - SET(GR_TEST_PYTHON_DIRS +if(ENABLE_TESTING) +include(GrTest) +file(GLOB py_qa_test_files "qa_*.py") +foreach(py_qa_test_file ${py_qa_test_files}) + get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) + set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gnuradio-core/src/python ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ${CMAKE_BINARY_DIR}/gr-qtgui/python ${CMAKE_BINARY_DIR}/gr-qtgui/swig ) - SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui) + set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) -ENDFOREACH(py_qa_test_file) -ENDIF(ENABLE_TESTING) +endforeach(py_qa_test_file) +endif(ENABLE_TESTING) diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt index 047229944..234af5a68 100644 --- a/gr-qtgui/swig/CMakeLists.txt +++ b/gr-qtgui/swig/CMakeLists.txt @@ -20,16 +20,16 @@ ######################################################################## # Setup swig generation ######################################################################## -INCLUDE(GrPython) -INCLUDE(GrSwig) +include(GrPython) +include(GrSwig) -SET(GR_SWIG_INCLUDE_DIRS +set(GR_SWIG_INCLUDE_DIRS ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} ${GR_QTGUI_INCLUDE_DIRS} ${QWT_INCLUDE_DIRS} ) -SET(GR_SWIG_LIBRARIES gnuradio-qtgui) +set(GR_SWIG_LIBRARIES gnuradio-qtgui) GR_SWIG_MAKE(qtgui_swig qtgui_swig.i) @@ -39,7 +39,7 @@ GR_SWIG_INSTALL( COMPONENT "qtgui_python" ) -INSTALL(FILES +install(FILES qtgui_sink_c.i qtgui_sink_f.i qtgui_time_sink_c.i |