diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake index 9fff046be3ca9534b787b8e84508e0a31a87b867..388741a2bbc21cacfa23fc2c5e4afb7d59917d3e 100644 --- a/cmake/toolchain/heptools-dev-generators.cmake +++ b/cmake/toolchain/heptools-dev-generators.cmake @@ -121,9 +121,7 @@ LCG_external_package(starlight r300 ${MCGENPATH}/starlight LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) - LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/cmake/toolchain/heptools-dev-generatorspython3.cmake b/cmake/toolchain/heptools-dev-generatorspython3.cmake index a92cee43308f6b94c8b30c12ed2f5d8bd2541bb9..6dd6382b5aa23021ec5b5ec5416b9b85111c1aaf 100644 --- a/cmake/toolchain/heptools-dev-generatorspython3.cmake +++ b/cmake/toolchain/heptools-dev-generatorspython3.cmake @@ -80,9 +80,7 @@ LCG_external_package(starlight r193 ${MCGENPATH}/starlight LCG_external_package(qd 2.3.13 ${MCGENPATH}/qd ) if (NOT (${LCG_HOST_ARCH} STREQUAL i686 OR ${LCG_OS} STREQUAL mac OR ${LCG_TARGET} MATCHES "clang" OR ${LCG_TARGET} MATCHES "gcc62" OR ${LCG_TARGET} MATCHES "gcc7" OR ${LCG_TARGET} MATCHES "gcc8")) - LCG_external_package(blackhat 0.9.9 ${MCGENPATH}/blackhat ) LCG_external_package(sherpa-mpich2 2.2.2 ${MCGENPATH}/sherpa-mpich2 author=2.2.2 hepevt=10000) - LCG_external_package(sherpa 2.2.2.blackhat ${MCGENPATH}/sherpa author=2.2.2 hepevt=10000 lhapdf=6.1.6) endif() LCG_external_package(photos 215.4 ${MCGENPATH}/photos ) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 6a6e6eda3229ed7981e92ecf2f9c9ca517ba1650..26a29c62c8b89ade3c600ebb4e73efb4dd221e4d 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1469,47 +1469,43 @@ LCGPackage_Add( #---BlackHat------------------------------------------------------------------------------------------ -if(${Python_native_version} VERSION_LESS 3) - LCGPackage_Add( - blackhat - URL ${gen_url}/blackhat-${blackhat_native_version}.tar.gz - CONFIGURE_COMMAND ./configure - --prefix=<INSTALL_DIR> - --with-QDpath=${qd_home} "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" - PYTHON=${Python_home}/bin/${PYTHON} - ${library_path}=${Python_home}/lib:$ENV{${library_path}} - PYTHONPATH=${Python_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH} - INSTALL_COMMAND make install "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" - BUILD_IN_SOURCE 1 - DEPENDS qd - ) -endif() +#LCGPackage_Add( +# blackhat +# URL ${gen_url}/blackhat-${blackhat_native_version}.tar.gz +# CONFIGURE_COMMAND ./configure +# --prefix=<INSTALL_DIR> +# --with-QDpath=${qd_home} "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" +# PYTHON=${Python_home}/bin/${PYTHON} +# ${library_path}=${Python_home}/lib:$ENV{${library_path}} +# PYTHONPATH=${Python_home}/lib/python${Python_config_version_twodigit}/site-packages:$ENV{PYTHONPATH} +# INSTALL_COMMAND make install "CFLAGS=-O2 -g0 -fpermissive" "CXXFLAGS=-O2 -g0 -fpermissive" "FFLAGS=-O2 -g0 -fpermissive" +# BUILD_IN_SOURCE 1 +# DEPENDS qd +#) -if(${Python_native_version} VERSION_LESS 3) - foreach (v ${blackhat_native_version}) - LCG_add_test(blackhat-${v}.build - BINARY_DIR blackhat/tests/${v} - SOURCE_DIR blackhat/tests - BUILD all - BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules - -DBLACKHAT_ROOT_DIR=${blackhat-${v}_home} - -DQD_ROOT_DIR=${qd_home} - # ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:${qd_home}/lib:$ENV{${library_path}} - ) +#foreach (v ${blackhat_native_version}) +# LCG_add_test(blackhat-${v}.build +# BINARY_DIR blackhat/tests/${v} +# SOURCE_DIR blackhat/tests +# BUILD all +# BUILD_OPTIONS -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules +# -DBLACKHAT_ROOT_DIR=${blackhat-${v}_home} +# -DQD_ROOT_DIR=${qd_home} +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:${qd_home}/lib:$ENV{${library_path}} +# ) - LCG_add_test(blackhat-${v}.native-cpp_example - TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./cpp_example - ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:$ENV{${library_path}} - DEPENDS blackhat-${v}.build - ) +# LCG_add_test(blackhat-${v}.native-cpp_example +# TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./cpp_example +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib:$ENV{${library_path}} +# DEPENDS blackhat-${v}.build +# ) - LCG_add_test(blackhat-${v}.native-fortran_example - TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./fortran_example - ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib/blackhat:${qd_home}/lib:$ENV{${library_path}} - DEPENDS blackhat-${v}.build - ) - endforeach() -endif() +# LCG_add_test(blackhat-${v}.native-fortran_example +# TEST_COMMAND ${CMAKE_COMMAND} -E chdir blackhat/tests/${v} ./fortran_example +# ENVIRONMENT ${library_path}=${blackhat-${v}_home}/lib/blackhat:${qd_home}/lib:$ENV{${library_path}} +# DEPENDS blackhat-${v}.build +# ) +endforeach() #---Sherpa------------------------------------------------------------------------------------------ LCGPackage_Add( @@ -1522,9 +1518,9 @@ LCGPackage_Add( --enable-hepmc2=${HepMC_home} --enable-openloops=. --enable-lhole - IF <VERSION> MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN - --enable-blackhat=${blackhat_home} - ENDIF +# IF <VERSION> MATCHES "blackhat" THEN +# --enable-blackhat=${blackhat_home} +# ENDIF IF NOT <VERSION> VERSION_LESS 2.2.1 THEN --enable-fastjet=${fastjet_home} ENDIF @@ -1552,7 +1548,7 @@ LCGPackage_Add( DEPENDS lhapdf-<sherpa_<NATIVE_VERSION>_lhapdf> HepMC IF NOT APPLE THEN sqlite ENDIF IF NOT <VERSION> VERSION_LESS 2.2.1 THEN fastjet ENDIF - IF <VERSION> MATCHES "blackhat" AND ${Python_native_version} VERSION_LESS 3 THEN blackhat ENDIF +# IF <VERSION> MATCHES "blackhat" THEN blackhat ENDIF ) #---Sherpa with MPI support------------------------------------------------------------------------------------------