diff options
| author | Johnathan Corgan | 2012-03-23 12:07:17 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-23 12:07:17 -0700 |
| commit | 47315e95c35824fb3dfabbf11ccdea323ab59887 (patch) | |
| tree | f3cdf61ba725a0e12f5eabebb507b3141142c975 | |
| parent | fc115e6aa0c22af172cbfcb50c895a03218819ba (diff) | |
| parent | f95a0abbd501142468b33d63bda0ca69e56cea5b (diff) | |
| download | gnuradio-47315e95c35824fb3dfabbf11ccdea323ab59887.tar.gz gnuradio-47315e95c35824fb3dfabbf11ccdea323ab59887.tar.bz2 gnuradio-47315e95c35824fb3dfabbf11ccdea323ab59887.zip | |
Merge branch 'maint'
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gruel/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bd0c35aa..4979e3498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ######################################################################## if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - message(FATAL_ERROR "Prevented in-tree built. This is bad practice.") + message(FATAL_ERROR "Prevented in-tree build. This is bad practice.") endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) ######################################################################## diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt index b33217c14..5fdc2b218 100644 --- a/gruel/CMakeLists.txt +++ b/gruel/CMakeLists.txt @@ -35,9 +35,9 @@ GR_REGISTER_COMPONENT("gruel" ENABLE_GRUEL include(GrMiscUtils) GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS - ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/src/include ${CMAKE_CURRENT_BINARY_DIR}/src/include + ${Boost_INCLUDE_DIRS} ) ######################################################################## |