Sākums Izpētīt Palīdzība
Pierakstīties
RONCC
/
Big-Data-HPC-Platform
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Merge branch 'candidate-5.0.6' into candidate-5.2.0

Conflicts:
	cmake_modules/dependencies/trusty.cmake
	cmake_modules/dependencies/utopic.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 gadi atpakaļ
vecāks
3647e93fb6 41a1e6900e
revīzija
e828f4d37b
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      cmake_modules/dependencies/trusty.cmake
  2. 1 1
      cmake_modules/dependencies/utopic.cmake

+ 1 - 1
cmake_modules/dependencies/trusty.cmake
Parādīt failu 

@@ -1 +1 @@
 
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.54.0, libicu52, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip")
 
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.54.0, libicu52, libxslt1, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1, zip")

+ 1 - 1
cmake_modules/dependencies/utopic.cmake
Parādīt failu 

@@ -1 +1 @@
 
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxalan-c111, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1")
 
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.55.0, libicu52, libxslt1, libxerces-c3.1, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive13, rsync, libapr1, libaprutil1")