HPCC-18976 Py2embed and Py3embed build fix for platform

Signed-off-by: Michael Gardner <michael.gardner@lexisnexisrisk.com>

CMakeLists.txt

@@ -151,8 +151,6 @@ if ( PLUGIN )
     HPCC_ADD_SUBDIRECTORY (plugins/Rembed "REMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/v8embed "V8EMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/memcached "MEMCACHED")
-    HPCC_ADD_SUBDIRECTORY (plugins/pyembed "PY2EMBED")
-    HPCC_ADD_SUBDIRECTORY (plugins/py3embed "PY3EMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/redis "REDIS")
     HPCC_ADD_SUBDIRECTORY (plugins/javaembed "JAVAEMBED")
     HPCC_ADD_SUBDIRECTORY (plugins/kafka "KAFKA")

cmake_modules/commonSetup.cmake

@@ -95,6 +95,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   option(USE_UNSIGNED_CHAR "Build system with default char type is unsigned" OFF)
   option(USE_MYSQL "Enable mysql support" ON)
   option(USE_LIBMEMCACHED "Enable libmemcached support" ON)
+  option(USE_PYTHON2 "Enable python2 language support for platform build" ON)
+  option(USE_PYTHON3 "Enable python3 language support for platform build" ON)
   option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
   option(JLIB_ONLY  "Build JLIB for other projects such as Configurator, Ganglia Monitoring, etc" OFF)
   # Generates code that is more efficient, but will cause problems if target platforms do not support it.
@@ -112,8 +114,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   endif()
   option(LOGGING_SERVICE "Configure use of logging service" ON)
   option(WSSQL_SERVICE "Configure use of ws_sql service" ON)
-  option(INCLUDE_PY2EMBED "Configure use of py2embed with standard platform package" ON)
-  option(INCLUDE_PY3EMBED "Configure use of py3embed with standard platform package" ON)
 
 
 
@@ -142,8 +142,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
     REMBED
     V8EMBED
     MEMCACHED
-    PY2EMBED
-    PY3EMBED
     REDIS
     SQS
     MYSQLEMBED
@@ -248,7 +246,6 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   endif()
 
   if ( CLIENTTOOLS_ONLY )
-      set(PY2EMBED ON)
       set(PLATFORM OFF)
       set(DEVEL OFF)
   endif()

plugins/py3embed/CMakeLists.txt

@@ -24,7 +24,7 @@
 #####################################################
 
 project(py3embed)
-if(PY3EMBED)
+if(USE_PYTHON3)
     unset(PYTHONLIBS_FOUND CACHE)
     unset(PYTHON_LIBRARY CACHE)
     unset(PYTHON_LIBRARIES CACHE)

plugins/pyembed/CMakeLists.txt

@@ -28,7 +28,7 @@ set(DEBUG_PYTHON_LIBRARY "/usr/lib/libpython2.7_d.so")
 
 project(py2embed)
 
-if(PY2EMBED)
+if(USE_PYTHON2)
     unset(PYTHONLIBS_FOUND CACHE)
     unset(PYTHON_LIBRARY CACHE)
     unset(PYTHON_LIBRARIES CACHE)