1111
1212import irods_python_ci_utilities
1313
14-
15- def add_cmake_to_front_of_path ():
16- cmake_path = '/opt/irods-externals/cmake3.21.4-0/bin'
17- os .environ ['PATH' ] = os .pathsep .join ([cmake_path , os .environ ['PATH' ]])
18-
19- def is_system_cmake_newer_than_externals_cmake ():
20- cmake_exe = shutil .which ('cmake' )
21- if cmake_exe is None :
22- return False
23-
24- try :
25- cmake_ver_out = subprocess .check_output (['cmake' , '--version' ]).decode ('utf-8' )
26- cmake_ver_line = cmake_ver_out .splitlines ()[0 ]
27- cmake_ver_str = cmake_ver_line .split ()[2 ]
28-
29- from packaging import version
30- cmake_sys_ver = version .parse (cmake_ver_str )
31- cmake_ext_ver = version .parse ('3.21.4' )
32- return cmake_sys_ver > cmake_ext_ver
33-
34- except :
35- return False
36-
3714def install_building_dependencies (externals_directory ):
3815
39- use_system_cmake = is_system_cmake_newer_than_externals_cmake ()
40-
4116 externals_list = ['irods-externals-boost1.81.0-2' ,
4217 'irods-externals-clang16.0.6-0' ,
4318 'irods-externals-json3.10.4-0' ]
44- if not use_system_cmake :
45- externals_list .append ('irods-externals-cmake3.21.4-0' )
4619 if externals_directory == 'None' or externals_directory is None :
4720 irods_python_ci_utilities .install_irods_core_dev_repository ()
4821 irods_python_ci_utilities .install_os_packages (externals_list )
@@ -53,15 +26,13 @@ def install_building_dependencies(externals_directory):
5326 for irods_externals in externals_list :
5427 externals .append (glob .glob (os .path .join (os_specific_directory , irods_externals + '*.{0}' .format (package_suffix )))[0 ])
5528 irods_python_ci_utilities .install_os_packages_from_files (externals )
56- if not use_system_cmake :
57- add_cmake_to_front_of_path ()
5829 install_os_specific_dependencies ()
5930
6031def install_os_specific_dependencies_apt ():
61- irods_python_ci_utilities .install_os_packages (['make' , 'python3-dev' , 'libssl-dev' , 'gcc' ])
32+ irods_python_ci_utilities .install_os_packages (['cmake' , ' make' , 'python3-dev' , 'libssl-dev' , 'gcc' ])
6233
6334def install_os_specific_dependencies_yum ():
64- irods_python_ci_utilities .install_os_packages (['make' , 'gcc' , 'python3-devel' , 'openssl-devel' ])
35+ irods_python_ci_utilities .install_os_packages (['cmake' , ' make' , 'gcc' , 'python3-devel' , 'openssl-devel' ])
6536
6637def install_os_specific_dependencies ():
6738 dispatch_map = {
0 commit comments