This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit d559764d2befd3fc47fb2e58aece92fb112408c8 Author: Gabor Gyimesi <[email protected]> AuthorDate: Thu Jul 20 14:32:07 2023 +0200 MINIFICPP-2098 Add ENABLE_ALL for all extensions Closes #1603 Signed-off-by: Marton Szasz <[email protected]> --- cmake/VerifyPythonCompatibility.cmake | 2 +- extensions/bustache/CMakeLists.txt | 2 +- extensions/kubernetes/CMakeLists.txt | 3 +-- extensions/opc/CMakeLists.txt | 3 +-- extensions/opencv/CMakeLists.txt | 2 +- extensions/openwsman/CMakeLists.txt | 2 +- extensions/pdh/CMakeLists.txt | 2 +- extensions/systemd/CMakeLists.txt | 2 +- extensions/tensorflow/CMakeLists.txt | 2 ++ 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/VerifyPythonCompatibility.cmake b/cmake/VerifyPythonCompatibility.cmake index 16667e0fc..7923710b5 100644 --- a/cmake/VerifyPythonCompatibility.cmake +++ b/cmake/VerifyPythonCompatibility.cmake @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -if (NOT ENABLE_PYTHON_SCRIPTING) +if (NOT (ENABLE_ALL OR ENABLE_PYTHON_SCRIPTING)) return() endif() diff --git a/extensions/bustache/CMakeLists.txt b/extensions/bustache/CMakeLists.txt index 3e130dd4b..85c8c5cf6 100644 --- a/extensions/bustache/CMakeLists.txt +++ b/extensions/bustache/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT ENABLE_BUSTACHE) +if (NOT (ENABLE_ALL OR ENABLE_BUSTACHE)) return() endif() diff --git a/extensions/kubernetes/CMakeLists.txt b/extensions/kubernetes/CMakeLists.txt index f841d95f1..d5c0131ba 100644 --- a/extensions/kubernetes/CMakeLists.txt +++ b/extensions/kubernetes/CMakeLists.txt @@ -14,8 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - -if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND ENABLE_KUBERNETES) OR OPENSSL_OFF) +if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (ENABLE_ALL OR ENABLE_KUBERNETES)) OR OPENSSL_OFF) return() endif() diff --git a/extensions/opc/CMakeLists.txt b/extensions/opc/CMakeLists.txt index e8e6dc08b..92f3c3913 100644 --- a/extensions/opc/CMakeLists.txt +++ b/extensions/opc/CMakeLists.txt @@ -16,8 +16,7 @@ # specific language governing permissions and limitations # under the License. # - -if (NOT ENABLE_OPC) +if (NOT (ENABLE_ALL OR ENABLE_OPC)) return() endif() diff --git a/extensions/opencv/CMakeLists.txt b/extensions/opencv/CMakeLists.txt index a7c647d05..69d1f24ad 100644 --- a/extensions/opencv/CMakeLists.txt +++ b/extensions/opencv/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT ENABLE_OPENCV) +if (NOT (ENABLE_ALL OR ENABLE_OPENCV)) return() endif() diff --git a/extensions/openwsman/CMakeLists.txt b/extensions/openwsman/CMakeLists.txt index a628766ad..2023ce086 100644 --- a/extensions/openwsman/CMakeLists.txt +++ b/extensions/openwsman/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT (ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL)) +if (NOT ((ENABLE_ALL OR ENABLE_OPENWSMAN) AND NOT DISABLE_CIVET AND NOT DISABLE_CURL)) return() endif() diff --git a/extensions/pdh/CMakeLists.txt b/extensions/pdh/CMakeLists.txt index 633fd730f..8804e28b6 100644 --- a/extensions/pdh/CMakeLists.txt +++ b/extensions/pdh/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT (WIN32 AND ENABLE_PDH)) +if (NOT (WIN32 AND (ENABLE_ALL OR ENABLE_PDH))) return() endif() diff --git a/extensions/systemd/CMakeLists.txt b/extensions/systemd/CMakeLists.txt index 9a77ee255..2fcdd35a6 100644 --- a/extensions/systemd/CMakeLists.txt +++ b/extensions/systemd/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT ENABLE_SYSTEMD OR NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") +if (NOT (ENABLE_ALL OR ENABLE_SYSTEMD) OR NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") return() endif() diff --git a/extensions/tensorflow/CMakeLists.txt b/extensions/tensorflow/CMakeLists.txt index 1c455fc96..975b44d33 100644 --- a/extensions/tensorflow/CMakeLists.txt +++ b/extensions/tensorflow/CMakeLists.txt @@ -17,6 +17,8 @@ # under the License. # +# The TensorFlow extension requires the libtensorflow_cc.so library to be installed on the system +# Due to this reason ENABLE_ALL does not include the TensorFlow extension if (NOT ENABLE_TENSORFLOW) return() endif()
