Skip to content

Commit e20ba63

Browse files
Jantrondeau
Jan
authored andcommittedJul 28, 2014
trellis: working on issue to fix locations of fsm files in examples.
+ Workaround for the path problem with cmake to use templates for install + GRC blocks now check if FSM_Args are strings and if the file exists + Changed example generation with CMake
1 parent 475b9e0 commit e20ba63

16 files changed

+2109
-2503
lines changed
 

‎gr-trellis/examples/grc/CMakeLists.txt

+32-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,40 @@
1717
# the Free Software Foundation, Inc., 51 Franklin Street,
1818
# Boston, MA 02110-1301, USA.
1919

20+
## Configure GRC examples to point to the right fsm_files directory
21+
set(FSM_FILE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${GR_PKG_TRELLIS_EXAMPLES_DIR}/fsm_files/")
22+
configure_file(
23+
"${CMAKE_CURRENT_LIST_DIR}/pccc.grc"
24+
"${CMAKE_CURRENT_BINARY_DIR}/pccc.grc"
25+
)
26+
27+
configure_file(
28+
"${CMAKE_CURRENT_LIST_DIR}/pccc1.grc"
29+
"${CMAKE_CURRENT_BINARY_DIR}/pccc1.grc"
30+
)
31+
32+
configure_file(
33+
"${CMAKE_CURRENT_LIST_DIR}/sccc.grc"
34+
"${CMAKE_CURRENT_BINARY_DIR}/sccc.grc"
35+
)
36+
37+
configure_file(
38+
"${CMAKE_CURRENT_LIST_DIR}/sccc1.grc"
39+
"${CMAKE_CURRENT_BINARY_DIR}/sccc1.grc"
40+
)
41+
42+
configure_file(
43+
"${CMAKE_CURRENT_LIST_DIR}/interference_cancellation.grc"
44+
"${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc"
45+
)
46+
2047
install(
2148
FILES
22-
interference_cancellation.grc
23-
pccc1.grc
24-
pccc.grc
25-
sccc1.grc
26-
sccc.grc
49+
${CMAKE_CURRENT_BINARY_DIR}/interference_cancellation.grc
50+
${CMAKE_CURRENT_BINARY_DIR}/pccc.grc
51+
${CMAKE_CURRENT_BINARY_DIR}/pccc1.grc
52+
${CMAKE_CURRENT_BINARY_DIR}/sccc1.grc
53+
${CMAKE_CURRENT_BINARY_DIR}/sccc.grc
2754
readme.txt
2855
DESTINATION ${GR_PKG_TRELLIS_EXAMPLES_DIR}
2956
COMPONENT "trellis-examples"

0 commit comments

Comments
 (0)