diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-11 12:55:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-11 12:56:11 (GMT) |
| commit | f15345be41c7b5514c2e0c3bd6cf4b8106b449e7 (patch) | |
| tree | ff300aeacc69372db06d6f25b4d1f243e466805e | |
| parent | 5951c676e6fd84e08e5ccaff8004c8cd8223f92a (diff) | |
| parent | fbb115d198783a32887649dc630e14119a045918 (diff) | |
| download | CMake-f15345be41c7b5514c2e0c3bd6cf4b8106b449e7.zip CMake-f15345be41c7b5514c2e0c3bd6cf4b8106b449e7.tar.gz CMake-f15345be41c7b5514c2e0c3bd6cf4b8106b449e7.tar.bz2 | |
Merge topic 'FindICE-more-exe'
fbb115d198 FindIce: Find slice2confluence and slice2matlab executables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2773
| -rw-r--r-- | Help/release/dev/FindICE-more-exe.rst | 5 | ||||
| -rw-r--r-- | Modules/FindIce.cmake | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/release/dev/FindICE-more-exe.rst b/Help/release/dev/FindICE-more-exe.rst new file mode 100644 index 0000000..fa18a88 --- /dev/null +++ b/Help/release/dev/FindICE-more-exe.rst @@ -0,0 +1,5 @@ +FindICE-more-exe +---------------- + +* The :module:`FindIce` module learned to find + ``slice2confluence`` and ``slice2matlab``. diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 42d3d47..1e0f0b8 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -40,6 +40,7 @@ Where ``<C>`` is the name of an Ice component, for example Ice slice programs are reported in:: + Ice_SLICE2CONFLUENCE_EXECUTABLE - path to slice2confluence executable Ice_SLICE2CPP_EXECUTABLE - path to slice2cpp executable Ice_SLICE2CS_EXECUTABLE - path to slice2cs executable Ice_SLICE2FREEZEJ_EXECUTABLE - path to slice2freezej executable @@ -47,6 +48,7 @@ Ice slice programs are reported in:: Ice_SLICE2HTML_EXECUTABLE - path to slice2html executable Ice_SLICE2JAVA_EXECUTABLE - path to slice2java executable Ice_SLICE2JS_EXECUTABLE - path to slice2js executable + Ice_SLICE2MATLAB_EXECUTABLE - path to slice2matlab executable Ice_SLICE2OBJC_EXECUTABLE - path to slice2objc executable Ice_SLICE2PHP_EXECUTABLE - path to slice2php executable Ice_SLICE2PY_EXECUTABLE - path to slice2py executable @@ -185,6 +187,7 @@ Other variables one may set to control this module are:: icestormmigrate) set(_Ice_slice_programs + slice2confluence slice2cpp slice2cs slice2freezej @@ -192,6 +195,7 @@ Other variables one may set to control this module are:: slice2html slice2java slice2js + slice2matlab slice2objc slice2php slice2py |