Changeset 8bac87d in tol for installer/linux/CMakeLists.txt

Timestamp:

Jan 10, 2016, 5:17:54 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

595f6e5

Parents:

6dce91c

Message:

refs #1899, etiquetamos el nombre del archivo segun la plataforma

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7176 be4846ae-f051-483a-831f-b64e7d08527f

File:

• installer/linux/CMakeLists.txt (modified) (2 diffs)

installer/linux/CMakeLists.txt

@@ -34 +34 @@
 set( CPACK_RPM_COMPONENT_INSTALL 1 PARENT_SCOPE )
 set( CPACK_PACKAGE_NAME tol PARENT_SCOPE )
-string( TOLOWER "${LINUX_NAME}.${CMAKE_SYSTEM_PROCESSOR}" _CPACK_SYSTEM_NAME )
-set( CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "" )
 
 #cpack --help-variable CPACK_PACKAGE_FILE_NAME
@@ -43 +41 @@
   
 set(CPACK_DEBIAN_PACKAGE_SECTION "Mathematics")
+
+if ( CPACK_GENERATOR STREQUAL "RPM" )
+  execute_process(COMMAND uname "-m"
+    OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+elseif( CPACK_GENERATOR STREQUAL "DEB" )
+  find_program(DPKG_CMD dpkg)
+  if(NOT DPKG_CMD)
+    message(STATUS "Can not find dpkg in your path, default to i386.")
+    set( PACKAGE_ARCHITECTURE i386 )
+  endif()
+  execute_process(COMMAND "${DPKG_CMD}" --print-architecture
+    OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+else( CPACK_GENERATOR STREQUAL "RPM" )
+  set( PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR} )
+endif( CPACK_GENERATOR STREQUAL "RPM" )
+
+string( TOLOWER "${LINUX_NAME}.${PACKAGE_ARQUITECTURE}" _CPACK_SYSTEM_NAME )
+set( CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "" )
 
 get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)