From 744ffd50ac5a73ce3619ae11ef9cf04c0886d74a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 3 Jul 2012 12:01:16 -0700
Subject: core: added general_generated to swig deps
We generate the docs so its important that the docs see this header generated first.
---
gnuradio-core/src/lib/swig/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnuradio-core/src/lib/swig')
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index d3c381b4bc..565bfd691c 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -43,7 +43,7 @@ set(GR_SWIG_LIBRARIES gnuradio-core)
# X86_64, g++'s resident set size was 650MB!
# ----------------------------------------------------------------
-set(GR_SWIG_TARGET_DEPS gengen_generated filter_generated)
+set(GR_SWIG_TARGET_DEPS general_generated gengen_generated filter_generated)
foreach(what runtime general gengen filter io hier)
SET(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i)
--
cgit v1.2.3
From 76258270f53da9a7b6bdeed0b38dde735956012e Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Tue, 3 Jul 2012 14:21:05 -0700
Subject: swig: added additional swig dependencies gruel/core
pmt swig gen depends upon the generated header
core depends upon pmt swig custom target
Conflicts:
gruel/src/swig/CMakeLists.txt
---
gnuradio-core/src/lib/swig/CMakeLists.txt | 5 ++++-
gruel/src/lib/pmt/CMakeLists.txt | 4 +++-
gruel/src/swig/CMakeLists.txt | 5 ++++-
3 files changed, 11 insertions(+), 3 deletions(-)
(limited to 'gnuradio-core/src/lib/swig')
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index 565bfd691c..5b740d916d 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -43,7 +43,7 @@ set(GR_SWIG_LIBRARIES gnuradio-core)
# X86_64, g++'s resident set size was 650MB!
# ----------------------------------------------------------------
-set(GR_SWIG_TARGET_DEPS general_generated gengen_generated filter_generated)
+set(GR_SWIG_TARGET_DEPS general_generated gengen_generated filter_generated pmt_swig)
foreach(what runtime general gengen filter io hier)
SET(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i)
@@ -61,8 +61,11 @@ foreach(what runtime general gengen filter io hier)
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
COMPONENT "core_swig"
)
+ list(APPEND core_swig_deps ${SWIG_MODULE_gnuradio_core_${what}_REAL_NAME})
endforeach(what)
+add_custom_target(core_swig DEPENDS ${core_swig_deps})
+
########################################################################
# Install various files
########################################################################
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
index 72bd27a046..6ea616e107 100644
--- a/gruel/src/lib/pmt/CMakeLists.txt
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -53,6 +53,8 @@ ADD_FILE_DEPENDENCIES(
${PMT_SERIAL_TAGS_H}
)
+add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H})
+
########################################################################
# Generate other pmt stuff
########################################################################
diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt
index f9d1758ec4..9686225874 100644
--- a/gruel/src/swig/CMakeLists.txt
+++ b/gruel/src/swig/CMakeLists.txt
@@ -23,7 +23,8 @@
include(GrPython)
include(GrSwig)
-set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS})
+set(GR_SWIG_TARGET_DEPS pmt_generated)
+set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
set(GR_SWIG_LIBRARIES gruel)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i)
@@ -43,3 +44,5 @@ install(
DESTINATION ${GR_INCLUDE_DIR}/gruel/swig
COMPONENT "gruel_swig"
)
+
+add_custom_target(pmt_swig DEPENDS ${SWIG_MODULE_pmt_swig_REAL_NAME})
--
cgit v1.2.3