Browse Source

HPCC-8788 Require Python 2.7 to build pyembed

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 years ago
parent
commit
56c2fb4c8f
2 changed files with 12 additions and 3 deletions
  1. 11 2
      cmake_modules/commonSetup.cmake
  2. 1 1
      plugins/pyembed/CMakeLists.txt

+ 11 - 2
cmake_modules/commonSetup.cmake

@@ -301,7 +301,7 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
   macro(ADD_PLUGIN)
     PARSE_ARGUMENTS(PLUGIN
-        "PACKAGES;OPTION"
+        "PACKAGES;OPTION;MINVERSION;MAXVERSION"
         ""
         ${ARGN}
     )
@@ -314,7 +314,16 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     FOREACH(package ${PLUGIN_PACKAGES})
       set(findvar ${package}_FOUND)
       string(TOUPPER ${findvar} PACKAGE_FOUND)
-      find_package(${package})
+      if ("${PLUGIN_MINVERSION}" STREQUAL "")
+        find_package(${package})
+      else()
+        set(findvar ${package}_VERSION_STRING)
+        string(TOUPPER ${findvar} PACKAGE_VERSION_STRING)
+        find_package(${package} ${PLUGIN_MINVERSION} )
+        if ("${${PACKAGE_VERSION_STRING}}" VERSION_GREATER "${PLUGIN_MAXVERSION}")
+          set(${PLUGIN_FOUND} 0)
+        endif()
+      endif()
       if (${PACKAGE_FOUND})
         set(PLUGIN_FOUND 1)
       else()

+ 1 - 1
plugins/pyembed/CMakeLists.txt

@@ -27,7 +27,7 @@ set ( debug_python Off )   # A lot slower but can assist in debugging...
 
 project( pyembed )
 
-ADD_PLUGIN(pyembed PACKAGES PythonLibs OPTION MAKE_PYEMBED)
+ADD_PLUGIN(pyembed PACKAGES PythonLibs OPTION MAKE_PYEMBED MINVERSION 2.7 MAXVERSION 2.7)
 
 if ( MAKE_PYEMBED )