summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2012-11-28 20:06:49 -0800
committerTom Rondeau2012-11-28 20:06:49 -0800
commitd6bcc93a6965b9f2fd226a5bb05b051e95cd625d (patch)
treeb6b579dad0c580de07d98b3f81a844ec75cc2e88
parentfbef82839ef85bfd7837f8534af2a3a74018930a (diff)
downloadgnuradio-d6bcc93a6965b9f2fd226a5bb05b051e95cd625d.tar.gz
gnuradio-d6bcc93a6965b9f2fd226a5bb05b051e95cd625d.tar.bz2
gnuradio-d6bcc93a6965b9f2fd226a5bb05b051e95cd625d.zip
build: set Boost_INCLUDE_DIRS for components (mostly for OSX and Windows).
-rw-r--r--gnuradio-core/CMakeLists.txt1
-rw-r--r--gruel/src/swig/CMakeLists.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 5f26216d3..44f099e07 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -45,6 +45,7 @@ GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
include(GrMiscUtils)
GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
+ ${Boost_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS} #headers depend on gruel
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt
index 332d5866f..a5e3f9399 100644
--- a/gruel/src/swig/CMakeLists.txt
+++ b/gruel/src/swig/CMakeLists.txt
@@ -24,7 +24,7 @@ include(GrPython)
include(GrSwig)
set(GR_SWIG_TARGET_DEPS pmt_generated)
-set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
+set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS})
set(GR_SWIG_LIBRARIES gruel)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i)