summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-05 17:56:28 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-05 17:56:28 -0500
commitc9d74e8e53b57a512ca32f23061f0cd7eb0e83b7 (patch)
treeac0177874f05cfa930c56492fafe4f83bf0d2db4
parent359dec2bc86584899d503c93d8f12d911f0904f0 (diff)
build: fixing earlier fix on generating and installing headers.
-rw-r--r--gr-analog/include/analog/CMakeLists.txt4
-rw-r--r--gr-blocks/include/blocks/CMakeLists.txt4
-rw-r--r--gr-digital/include/digital/CMakeLists.txt4
-rw-r--r--gr-filter/include/filter/CMakeLists.txt4
-rw-r--r--gr-trellis/include/trellis/CMakeLists.txt4
5 files changed, 10 insertions, 10 deletions
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt
index 9f1dce500d..837d927efe 100644
--- a/gr-analog/include/analog/CMakeLists.txt
+++ b/gr-analog/include/analog/CMakeLists.txt
@@ -58,7 +58,7 @@ macro(expand_h root)
)
#install rules for the generated h files
- list(APPEND analog_generated_includes ${expanded_files_h})
+ list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
########################################################################
@@ -75,7 +75,7 @@ add_custom_target(analog_generated_includes DEPENDS
# Install header files
########################################################################
install(FILES
- ${analog_generated_includes}
+ ${generated_includes}
api.h
cpm.h
agc.h
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index 7fd7783df8..0459097b0d 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -58,7 +58,7 @@ macro(expand_h root)
)
#install rules for the generated h files
- list(APPEND blocks_generated_includes ${expanded_files_h})
+ list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
########################################################################
@@ -87,7 +87,7 @@ add_custom_target(blocks_generated_includes DEPENDS
# Install header files
########################################################################
install(FILES
- ${blocks_generated_includes}
+ ${generated_includes}
api.h
add_ff.h
char_to_float.h
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt
index acec5648bb..0cc043ed17 100644
--- a/gr-digital/include/digital/CMakeLists.txt
+++ b/gr-digital/include/digital/CMakeLists.txt
@@ -58,7 +58,7 @@ macro(expand_h root)
)
#install rules for the generated h files
- list(APPEND digital_generated_includes ${expanded_files_h})
+ list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
########################################################################
@@ -74,7 +74,7 @@ add_custom_target(digital_generated_includes DEPENDS
# Install header files
########################################################################
install(FILES
- ${digital_generated_includes}
+ ${generated_includes}
api.h
constellation.h
crc32.h
diff --git a/gr-filter/include/filter/CMakeLists.txt b/gr-filter/include/filter/CMakeLists.txt
index 953fe7420c..4b5124812f 100644
--- a/gr-filter/include/filter/CMakeLists.txt
+++ b/gr-filter/include/filter/CMakeLists.txt
@@ -58,7 +58,7 @@ macro(expand_h root)
)
#install rules for the generated h files
- list(APPEND filter_generated_includes ${expanded_files_h})
+ list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
########################################################################
@@ -77,7 +77,7 @@ add_custom_target(filter_generated_includes DEPENDS
# Install header files
########################################################################
install(FILES
- ${filter_generated_includes}
+ ${generated_includes}
api.h
adaptive_fir.h
firdes.h
diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/trellis/CMakeLists.txt
index 9bf2e129cf..6abb93a6f4 100644
--- a/gr-trellis/include/trellis/CMakeLists.txt
+++ b/gr-trellis/include/trellis/CMakeLists.txt
@@ -58,7 +58,7 @@ macro(expand_h root)
)
#install rules for the generated h files
- list(APPEND trellis_generated_includes ${expanded_files_h})
+ list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
########################################################################
@@ -83,7 +83,7 @@ add_custom_target(trellis_generated_includes DEPENDS
# Install header files
########################################################################
install(FILES
- ${trellis_generated_includes}
+ ${generated_includes}
api.h
base.h
calc_metric.h