Changeset 39c941d in tol for installer/linux/CMakeLists.txt

Timestamp:

Jan 10, 2016, 9:58:14 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

a61660c

Parents:

47b0a0b

Message:

refs #1899, error tipografico, para sistemas basado en rpm instalamos en lib64 la version de 64 bit

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

File:

• installer/linux/CMakeLists.txt (modified) (1 diff)

installer/linux/CMakeLists.txt

@@ -59 +59 @@
 endif( CPACK_GENERATOR STREQUAL "RPM" )
 
-string( TOLOWER "${LINUX_NAME}.${PACKAGE_ARQUITECTURE}" _CPACK_SYSTEM_NAME )
+string( TOLOWER "${LINUX_NAME}.${PACKAGE_ARCHITECTURE}" _CPACK_SYSTEM_NAME )
 set( CPACK_SYSTEM_NAME ${_CPACK_SYSTEM_NAME} CACHE STRING "" )
 
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-if( "${LIB64}" STREQUAL "TRUE" )
-  set( LIBSUFFIX 64 )
-else( "${LIB64}" STREQUAL "TRUE" )
+if ( CPACK_GENERATOR STREQUAL "RPM" )
+  get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+  if( LIB64 STREQUAL "TRUE" )
+    set( LIBSUFFIX "64" )
+  else( LIB64 STREQUAL "TRUE" )
+    set( LIBSUFFIX "" )
+  endif( LIB64 STREQUAL "TRUE" )
+else( CPACK_GENERATOR STREQUAL "RPM" )
   set( LIBSUFFIX "" )
-endif( "${LIB64}" STREQUAL "TRUE" )
+endif( CPACK_GENERATOR STREQUAL "RPM" )
 
 # RPM