Skip to content

Commit 891973b

Browse files
committed
CMAKE_CML_PATH -> CML_PATH
1 parent 456c4ce commit 891973b

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,6 +1226,6 @@ endif(NOT APPLE)
12261226
test_OFDM_modem_datac3_octave
12271227
test_fsk_lib_4fsk_ldpc
12281228
PROPERTIES
1229-
ENVIRONMENT "CMAKE_CML_PATH=${CMAKE_CURRENT_BINARY_DIR}/cml"
1229+
ENVIRONMENT "CML_PATH=${CMAKE_CURRENT_BINARY_DIR}/cml"
12301230
)
12311231
endif(UNITTEST)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ CTest is used as a test framework, with support from [GNU Octave](https://www.gn
153153
```
154154

155155
1. Many Octave scripts rely on the CML LDPC library. To run these from the Octave CLI, you need to set
156-
the `CMAKE_CML_PATH` environment variable. A convenient way to do this is using a `.octaverc` file
156+
the `CML_PATH` environment variable. A convenient way to do this is using a `.octaverc` file
157157
in your `codec/octave` directory. For example on a Linux machine, create a `.octaverc` file:
158158
```
159-
setenv("CMAKE_CML_PATH","../build_linux/cml")
159+
setenv("CML_PATH","../build_linux/cml")
160160
```
161161

162162
## Directories

octave/ldpc.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
% octave:> make
1616
% (you'll see a few warnings but hopefully no errors)
1717
%
18-
% Optionally set an environment variable for CMAKE_CML_PATH in your shell or
18+
% Optionally set an environment variable for CML_PATH in your shell or
1919
% in your codec2/octave/.octaverc file
2020

2121
1;
2222

2323
function init_cml()
2424
currentdir = pwd;
2525

26-
path_to_cml = getenv("CMAKE_CML_PATH")
26+
path_to_cml = getenv("CML_PATH");
2727

2828
if exist(path_to_cml, 'dir') == 7
2929
cd(path_to_cml)
@@ -32,7 +32,7 @@ function init_cml()
3232
else
3333
printf("\n---------------------------------------------------\n");
3434
printf("Can't start CML in path: %s\n", path_to_cml);
35-
printf("See CML path instructions at top of this script (ldpc.m)\n");
35+
printf("See CML_PATH instructions at top of this script (ldpc.m)\n");
3636
printf("-----------------------------------------------------\n\n");
3737
assert(0);
3838
end

unittest/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ find_program(OCTAVE_CMD octave-cli REQUIRED)
9595
message("Octave command: ${OCTAVE_CMD}")
9696

9797
include(ExternalProject)
98-
set(CMAKE_CML_PATH ${CMAKE_CURRENT_BINARY_DIR}/../cml)
98+
set(CML_PATH ${CMAKE_CURRENT_BINARY_DIR}/../cml)
9999
ExternalProject_Add(cml
100-
SOURCE_DIR ${CMAKE_CML_PATH}
100+
SOURCE_DIR ${CML_PATH}
101101
URL http://www.iterativesolutions.com/user/image/cml.1.10.zip
102102
BUILD_IN_SOURCE 1
103103
CONFIGURE_COMMAND true # No configuration required

0 commit comments

Comments
 (0)