[qpid-dispatch] branch main updated: NO-JIRA: Use simpler CMAKE syntax

[ea...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eallen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/main by this push:
     new aa750cd  NO-JIRA: Use simpler CMAKE syntax
     new 18624c4  Merge pull request #1361 from ErnieAllen/ernie-cmake-console
aa750cd is described below

commit aa750cd46318b5cdf72c23f15f40b6ea1db448c2
Author: Ernest Allen <ea...@redhat.com>
AuthorDate: Tue Aug 31 14:42:15 2021 -0400

    NO-JIRA: Use simpler CMAKE syntax
---
 console/CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 33aff77..c095c50 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -28,8 +28,9 @@ if(CONSOLE_INSTALL)
   if (NPM_EXECUTABLE)
     execute_process(COMMAND ${NPM_EXECUTABLE} --version
         OUTPUT_VARIABLE NPM_VERSION)
-    if(NOT (${NPM_VERSION} VERSION_LESS "3.1.10"))
-
+    if(${NPM_VERSION} VERSION_LESS "3.1.10")
+      message(STATUS "Cannot build console. npm version 3.1.10 or greater is required.")
+    else(${NPM_VERSION} VERSION_LESS "3.1.10")
           set(CONSOLE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/console/react")
           set(CONSOLE_BUILD_DIR "${CMAKE_BINARY_DIR}/console")
 
@@ -94,9 +95,7 @@ if(CONSOLE_INSTALL)
             PATTERN "*.map" EXCLUDE
           )
 
-    else(NOT (${NPM_VERSION} VERSION_LESS "3.1.10"))
-      message(STATUS "Cannot build console. npm version 3.1.10 or greater is required.")
-    endif(NOT (${NPM_VERSION} VERSION_LESS "3.1.10"))
+    endif(${NPM_VERSION} VERSION_LESS "3.1.10")
   endif(NPM_EXECUTABLE)
 
 endif(CONSOLE_INSTALL)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org