diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index a8ff9a0d4e8ee4f1c512b02be1cbbd6843d7a52e..4230185c8a99ca589701ae6326131046ad48aca9 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -834,8 +834,9 @@ LCGPackage_Add( --with-hepmc=${HepMC_home} --with-lhapdf=<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home> --with-gsl=${GSL_home} --without-javagui CFLAGS=-O2 CXXFLAGS=-O2 FFLAGS=-O2 - --with-fastjet=${fastjet_home} - --with-rivet=<rivet-<thepeg_<NATIVE_VERSION>_rivet>_home> + --with-fastjet=${fastjet_home} + --with-rivet=<rivet-<thepeg_<NATIVE_VERSION>_rivet>_home> + --with-boost=${Boost_home} ${library_path}=${GSL_home}/lib:$ENV{${library_path}} ELSE CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> @@ -850,13 +851,13 @@ LCGPackage_Add( IF NOT <VERSION> VERSION_LESS 2.0.3 THEN --with-rivet=<rivet-<thepeg_<NATIVE_VERSION>_rivet>_home> ENDIF ${library_path}=${GSL_home}/lib:$ENV{${library_path}} ENDIF - BUILD_COMMAND ${MAKE} all ${library_path}=<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>:<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>/lib:$ENV{${library_path}} - INSTALL_COMMAND make install-strip ${library_path}=<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>:<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>/lib:$ENV{${library_path}} + BUILD_COMMAND ${MAKE} all ${library_path}=<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>:<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>/lib:${Boost_home}/lib:$ENV{${library_path}} + INSTALL_COMMAND make install-strip ${library_path}=<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>:<lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf>_home>/lib:${Boost_home}/lib:$ENV{${library_path}} BUILD_IN_SOURCE 1 DEPENDS HepMC GSL lhapdf-<thepeg_<NATIVE_VERSION>_lhapdf> - IF NOT <VERSION> VERSION_LESS 2.0.0 THEN fastjet ENDIF + IF NOT <VERSION> VERSION_LESS 2.0.0 THEN fastjet ENDIF IF NOT <VERSION> VERSION_LESS 2.0.3 THEN rivet-<thepeg_<NATIVE_VERSION>_rivet> ENDIF - IF NOT <VERSION> VERSION_LESS 2.1.1 THEN automake ENDIF + IF NOT <VERSION> VERSION_LESS 2.1.1 THEN automake Boost ENDIF ) if (NOT shell_ext MATCHES "csh")