diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d190c73947553b1cb6db4a16411f4dbe7c951965..f4a278d5eb36a7d7b3634fe4aca3f8a5decf54cf 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -572,8 +572,9 @@ LCGPackage_Add( INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/dist <INSTALL_DIR> COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib/python2.7/site-packages # COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/py4j-0.9-src.zip <INSTALL_DIR>/lib/python2.7/site-packages/. - COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/pyspark.zip <INSTALL_DIR>/lib/python2.7/site-packages/. - COMMAND ${CMAKE_COMMAND} -E unzip <INSTALL_DIR>/lib/python2.7/site-packages/pyspark.zip + COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/pyspark.zip <INSTALL_DIR>/lib/python2.7/site-packages/. + COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/lib/python2.7/site-packages/ unzip pyspark.zip + BUILD_IN_SOURCE 1 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 92e272a372d919a3e2b26c518ab1e771c862f8bf..1af001661e37e89faa33ed2f72c2f46cda5b1c7e 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -641,19 +641,19 @@ LCGPackage_Add( #---py4j------------------------------------------------------------------------------------------------------ LCGPackage_Add( py4j - URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}-src.zip + URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}.tar.gz CONFIGURE_COMMAND <VOID> - BUILD_COMMAND ${Python_cmd} setup.py build + BUILD_COMMAND ${Exec_cmd} PYTHONPATH=${pytools_home}/lib/python${Python_config_version_twodigit}/site-packages + ${Python_cmd} setup.py build INSTALL_COMMAND ${Lock_cmd} - COMMAND ${Python_cmd} setup.py install --prefix <INSTALL_DIR> + COMMAND ${Exec_cmd} PYTHONPATH=${pytools_home}/lib/python${Python_config_version_twodigit}/site-packages + ${Python_cmd} setup.py install --prefix <INSTALL_DIR> COMMAND ${Unlock_cmd} BUILD_IN_SOURCE 1 DEST_NAME pytools DEPENDS Python ) - - #---py------------------------------------------------------------------------------------------------------ LCGPackage_Add( py