Skip to content
Permalink
Browse files

Merge pull request #2771 from petermax2/2668_cmake_TOOLS

cmake: fix REQUIRED_TOOLS in function add_msr_test
  • Loading branch information...
markus2330 committed Jun 11, 2019
2 parents 783074c + 1ff8302 commit e0d506d3a3cd340512f4ec19caf6d80d83c70151
Showing with 9 additions and 1 deletion.
  1. +1 −1 cmake/ElektraCache.cmake
  2. +7 −0 cmake/Modules/LibAddTest.cmake
  3. +1 −0 doc/news/_preparation_next_release.md
@@ -66,7 +66,7 @@ set (ADDED_BINDINGS

remember_for_removal (TOOLS TO_REMOVE_TOOLS)

set (TOOLS_LIST_DEFAULT kdb gen-gpg-testkey)
set (TOOLS_LIST_DEFAULT kdb)

if (TOOLS MATCHES "DEFAULT")
set (TOOLS_FORCE FORCE)
@@ -118,6 +118,13 @@ function (add_msr_test NAME FILE)
if (tool_index GREATER -1)
return ()
endif ()

list (FIND TOOLS
${tool}
tool_index)
if (tool_index LESS 0)
return ()
endif ()
endforeach ()

add_test (NAME testshell_markdown_${NAME}
@@ -624,6 +624,7 @@ mounted, use `kdb gen -F <plugin>:<file> elektra <parentKey> <outputName>` to lo
### CMake

- The build system now rebuilds the [JNA binding](https://www.libelektra.org/bindings/jna) with Maven, if you change any of the Java source files of the binding. _(René Schwaiger)_
- `testshell_markdown_tutorial_crypto` is not compiled and executed if `gen-gpg-testkey` is not part of TOOLS. _(Peter Nirschl)_
- <<TODO>>
- <<TODO>>

0 comments on commit e0d506d

Please sign in to comment.
You can’t perform that action at this time.