Merge branch 'master' into qtapp
Conflicts: CMakeLists.txt lib/air_modes_preamble.cc
This commit is contained in:
+3
-1
@@ -22,7 +22,9 @@
|
||||
# Project setup
|
||||
########################################################################
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
project(gr-air-modes CXX)
|
||||
project(gr-gr-air-modes CXX)
|
||||
set(gr-gr-air-modes_VERSION_MAJOR 0)
|
||||
set(gr-gr-air-modes_VERSION_MINOR 0)
|
||||
enable_testing()
|
||||
|
||||
#select the release build type by default to get optimization flags
|
||||
|
||||
Reference in New Issue
Block a user