diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-05 13:47:34 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-05 13:47:34 -0500 |
| commit | c4a01b352664ea78ddb7bfe7ce65d62809737b54 (patch) | |
| tree | 1196532d8525e0034edbda0d97e3dfb68a16e252 | |
| parent | 229b33367aa0915b911902e6404d03e2c15d8ac7 (diff) | |
build: generated headers naming issue fixed.
| -rw-r--r-- | gr-analog/include/analog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-digital/include/digital/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-filter/include/filter/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-trellis/include/trellis/CMakeLists.txt | 3 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt index 33c4d55a79..9f1dce500d 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 generated_includes ${expanded_files_h}) + list(APPEND analog_generated_includes ${expanded_files_h}) endmacro(expand_h) ######################################################################## diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index 0459097b0d..7fd7783df8 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 generated_includes ${expanded_files_h}) + list(APPEND blocks_generated_includes ${expanded_files_h}) endmacro(expand_h) ######################################################################## @@ -87,7 +87,7 @@ add_custom_target(blocks_generated_includes DEPENDS # Install header files ######################################################################## install(FILES - ${generated_includes} + ${blocks_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 1a5869b3cd..acec5648bb 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 generated_includes ${expanded_files_h}) + list(APPEND digital_generated_includes ${expanded_files_h}) endmacro(expand_h) ######################################################################## diff --git a/gr-filter/include/filter/CMakeLists.txt b/gr-filter/include/filter/CMakeLists.txt index 9070a7489f..953fe7420c 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 generated_includes ${expanded_files_h}) + list(APPEND filter_generated_includes ${expanded_files_h}) endmacro(expand_h) ######################################################################## @@ -77,6 +77,7 @@ add_custom_target(filter_generated_includes DEPENDS # Install header files ######################################################################## install(FILES + ${filter_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 294481368a..9bf2e129cf 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 generated_includes ${expanded_files_h}) + list(APPEND trellis_generated_includes ${expanded_files_h}) endmacro(expand_h) ######################################################################## @@ -78,7 +78,6 @@ expand_h(pccc_decoder_combined_XX fb fs fi cb cs ci) add_custom_target(trellis_generated_includes DEPENDS ${generated_includes} ) -MESSAGE(STATUS "GENERATED INCLUDES: ${trellis_generated_includes}") ######################################################################## # Install header files |