Changeset b09e2f4f in tol for installer/linux/CMakeLists.txt

Timestamp:

Mar 28, 2017, 11:52:19 AM (10 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

fe5b9e1

Parents:

bb5f9a8

Message:

fixes #1950 corregimos las reglas para cpack, detectamos sistemas basandonos en uname y lsb_release

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

File:

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

installer/linux/CMakeLists.txt

@@ -20 +20 @@
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
+#include(cpack_generator)
 include(cpack_generator)
-
-message(STATUS "LINUX_NAME = ${LINUX_NAME}")
 
 if(CPACK_GENERATOR)
@@ -42 +41 @@
 
 # Variable PACKAGE_ARCHITECTURE
-if(CPACK_GENERATOR STREQUAL "RPM")
-  execute_process(COMMAND uname "-m"
-    OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
-    OUTPUT_STRIP_TRAILING_WHITESPACE )
-elseif(CPACK_GENERATOR STREQUAL "DEB")
-  message(STATUS "CPACK_DEBIAN_PACKAGE_ARCHITECTURE = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  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(NOT DPKG_CMD)
-  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")
+# if(CPACK_GENERATOR STREQUAL "RPM")
+#   execute_process(COMMAND uname "-m"
+#     OUTPUT_VARIABLE PACKAGE_ARCHITECTURE
+#     OUTPUT_STRIP_TRAILING_WHITESPACE )
+# elseif(CPACK_GENERATOR STREQUAL "DEB")
+#   message(STATUS "CPACK_DEBIAN_PACKAGE_ARCHITECTURE = ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+#   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(NOT DPKG_CMD)
+#   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")
+set(PACKAGE_ARCHITECTURE ${SPECIFIC_SYSTEM_ARCHITECTURE})
 message(STATUS "PACKAGE_ARCHITECTURE=${PACKAGE_ARCHITECTURE}")
 
 # Variable CPACK_SYSTEM_NAME
-string( TOLOWER "${LINUX_NAME}.${PACKAGE_ARCHITECTURE}" _CPACK_SYSTEM_NAME )
-set( CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "" )
+string(TOLOWER "${SPECIFIC_SYSTEM_NAME}.${PACKAGE_ARCHITECTURE}" _CPACK_SYSTEM_NAME)
+set(CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "")
 message(STATUS "CPACK_SYSTEM_NAME=${CPACK_SYSTEM_NAME}")
 
@@ -70 +70 @@
 #   ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}
 # See: cpack --help-variable CPACK_PACKAGE_FILE_NAME
-message(STATUS "CPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
+#message(STATUS "CPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
 
 #=== Components ==============================================================