Move logic into separate file. refs #7021

mantidproject · May 7, 2013 · ef55d93 · ef55d93
1 parent b4e3fb9
commit ef55d93
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/Code/Mantid/Build/CMake/CPackLinuxSetup.cmake b/Code/Mantid/Build/CMake/CPackLinuxSetup.cmake
@@ -8,27 +8,7 @@ string ( TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME )
 # define the source generators
 set ( CPACK_SOURCE_GENERATOR TGZ )
 
-find_program (LSB_CMD lsb_release)
-if ( LSB_CMD )
-  # get the distribution
-  execute_process ( COMMAND ${LSB_CMD} -i
-    OUTPUT_VARIABLE UNIX_DIST
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-  string ( REGEX REPLACE "Distributor ID:" "" UNIX_DIST ${UNIX_DIST} )
-  string ( STRIP ${UNIX_DIST} UNIX_DIST )
-  string ( REGEX REPLACE "RedHatEnterpriseClient" "RedHatEnterprise" UNIX_DIST ${UNIX_DIST} )
-  string ( REGEX REPLACE "RedHatEnterpriseWorkstation" "RedHatEnterprise" UNIX_DIST ${UNIX_DIST} )
-  # get the codename
-  execute_process ( COMMAND ${LSB_CMD} -c
-    OUTPUT_VARIABLE UNIX_CODENAME
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-  string ( REGEX REPLACE "Codename:" "" UNIX_CODENAME ${UNIX_CODENAME} )
-  string ( STRIP ${UNIX_CODENAME} UNIX_CODENAME )
-else ( LSB_CMD )
-  set ( UNIX_DIST "" )
-  set ( UNIX_CODENAME "" )
-endif ( LSB_CMD )
-message ( STATUS " DIST: ${UNIX_DIST} CODENAME: ${UNIX_CODENAME}" )
+include (DetermineLinuxDistro)
 
 # define which binary generators to use
 if ( ${UNIX_DIST} MATCHES "Ubuntu" )

diff --git a/Code/Mantid/Build/CMake/DetermineLinuxDistro.cmake b/Code/Mantid/Build/CMake/DetermineLinuxDistro.cmake
@@ -0,0 +1,22 @@
+
+find_program (LSB_CMD lsb_release)
+if ( LSB_CMD )
+  # get the distribution
+  execute_process ( COMMAND ${LSB_CMD} -i
+    OUTPUT_VARIABLE UNIX_DIST
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  string ( REGEX REPLACE "Distributor ID:" "" UNIX_DIST ${UNIX_DIST} )
+  string ( STRIP ${UNIX_DIST} UNIX_DIST )
+  string ( REGEX REPLACE "RedHatEnterpriseClient" "RedHatEnterprise" UNIX_DIST ${UNIX_DIST} )
+  string ( REGEX REPLACE "RedHatEnterpriseWorkstation" "RedHatEnterprise" UNIX_DIST ${UNIX_DIST} )
+  # get the codename
+  execute_process ( COMMAND ${LSB_CMD} -c
+    OUTPUT_VARIABLE UNIX_CODENAME
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  string ( REGEX REPLACE "Codename:" "" UNIX_CODENAME ${UNIX_CODENAME} )
+  string ( STRIP ${UNIX_CODENAME} UNIX_CODENAME )
+else ( LSB_CMD )
+  set ( UNIX_DIST "" )
+  set ( UNIX_CODENAME "" )
+endif ( LSB_CMD )
+message ( STATUS " DIST: ${UNIX_DIST} CODENAME: ${UNIX_CODENAME}" )