Browse Source

HPCC-9097 Added plugins flag to file name on rpm based systems

Added WITH_PLUGINS variable that is used to determine if -with-plugins
is added to the rpm package name.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Philip Schwartz 12 years ago
parent
commit
d06002dadd
2 changed files with 9 additions and 2 deletions
  1. 5 2
      CMakeLists.txt
  2. 4 0
      cmake_modules/commonSetup.cmake

+ 5 - 2
CMakeLists.txt

@@ -137,7 +137,6 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${minorver})
 SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
 SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
 set ( CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>" )
 set ( CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>" )
 set( CPACK_SOURCE_GENERATOR TGZ )
 set( CPACK_SOURCE_GENERATOR TGZ )
-set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
 SET(CPACK_RPM_PACKAGE_RELEASE "${version}${stagever}")
 SET(CPACK_RPM_PACKAGE_RELEASE "${version}${stagever}")
 if ( ${ARCH64BIT} EQUAL 1 )
 if ( ${ARCH64BIT} EQUAL 1 )
     set ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
     set ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
@@ -168,7 +167,11 @@ elseif ( UNIX )
 
 
     message ( "-- Auto Detecting Packaging type")
     message ( "-- Auto Detecting Packaging type")
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
-
+    if ( "${packageManagement}" STREQUAL "RPM" AND WITH_PLUGINS )
+        set ( CPACK_RPM_PACKAGE_VERSION "${projname}-with-plugins")
+    else()
+        set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
+    endif()
     if ( "${packageManagement}" STREQUAL "DEB" )
     if ( "${packageManagement}" STREQUAL "DEB" )
         set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
         set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
     elseif ( "${packageManagement}" STREQUAL "RPM" )
     elseif ( "${packageManagement}" STREQUAL "RPM" )

+ 4 - 0
cmake_modules/commonSetup.cmake

@@ -79,6 +79,10 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
 
   option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
   option(USE_OPTIONAL "Automatically disable requested features with missing dependencies" ON)
 
 
+  if ( USE_PYTHON OR USE_V8 OR USE_JNI OR USE_RINSIDE )
+      set( WITH_PLUGINS ON )
+  endif()
+
   if ( USE_XALAN AND USE_LIBXSLT )
   if ( USE_XALAN AND USE_LIBXSLT )
       set(USE_XALAN OFF)
       set(USE_XALAN OFF)
   endif()
   endif()