diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-03-08 15:30:25 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-03-08 15:30:25 -0500 |
| commit | 84d6a90dbc2aa547cc5482b264f4d68c5ef799a4 (patch) | |
| tree | 5f4c4125459bdedb11928ab38dad737af493b6ca | |
| parent | ba67f73429257c5781316f03f2957562004f2dc6 (diff) | |
cmake: changing where GR_CTRLPORT is defined to properly go into config.h.
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b1f7348d21..1bd5a911f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,11 +56,6 @@ IF(NOT DEFINED BOOST_ROOT) SET(BOOST_ROOT ${CMAKE_INSTALL_PREFIX}) ENDIF() -if(ENABLE_GR_CTRLPORT) - set(GR_CTRLPORT True) - add_definitions(-DGR_CTRLPORT) -endif(ENABLE_GR_CTRLPORT) - ######################################################################## # Import executables from a native build (for cross compiling) # http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build @@ -333,6 +328,12 @@ add_subdirectory(gr-fcd) add_subdirectory(gr-wavelet) add_subdirectory(gr-wxgui) +# Defining GR_CTRLPORT for gnuradio/config.h +if(ENABLE_GR_CTRLPORT) + set(GR_CTRLPORT True) + add_definitions(-DGR_CTRLPORT) +endif(ENABLE_GR_CTRLPORT) + # Install our Cmake modules into $prefix/lib/cmake/gnuradio # See "Package Configuration Files" on page: # http://www.cmake.org/Wiki/CMake/Tutorials/Packaging |