[Commit-gnuradio] [gnuradio] branch master updated (24dc96a -> 5568d1e)

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a change to branch master
in repository gnuradio.

      from  24dc96a   Merge branch 'master_osx'
       new  ba67f73   Revert "docs: fixes issues with building docs when 
various components are not enabled."
       new  84d6a90   cmake: changing where GR_CTRLPORT is defined to properly 
go into config.h.
       new  5568d1e   cmake: Turning performance counters on at compile-time by 
default. Still default to off at runtime (modify gnuradio-runtime.conf file to 
change this).

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)