diff --git a/DEPENDENCIES b/DEPENDENCIES index c32f964f8..6d350fbe9 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -3,7 +3,7 @@ flavors. This dependencies are needed to be able to install FairSoft. The following programs/compiler are needed: -cmake gcc g++ gfortran make patch sed curl +cmake gcc g++ gfortran make patch sed curl bzip2 gzip unzip tar subversion git The following development packages are needed @@ -57,7 +57,7 @@ yum install cmake gcc gcc-c++ gcc-gfortran make patch sed \ subversion git flex bison imake redhat-lsb-core \ python-devel libxml2-devel wget openssl-devel -Fedora22 +Fedora22 dnf install cmake gcc gcc-c++ gcc-gfortran make patch sed \ libX11-devel libXft-devel libXpm-devel libXext-devel \ diff --git a/alfaconfig.sh b/alfaconfig.sh index 64ba1a53e..1469e3430 100755 --- a/alfaconfig.sh +++ b/alfaconfig.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # # AlFa package installation script # m.al-turany@gsi.de, Sept. 2014 diff --git a/configure.sh b/configure.sh index 5773f1f43..540e88b39 100755 --- a/configure.sh +++ b/configure.sh @@ -1,16 +1,16 @@ -#!/bin/bash +#!/bin/bash # # CBM package compilation script # m.al-turany@gsi.de, June 2006 # protopop@jlab.org, June 2006 # update of the script -# include debug version and +# include debug version and # intel compiler switches # f.uhlig@gsi.de, July 2007 # debug options on :set -xv # debug options off:set +xv -# +# set +xv # unset ROOTSYS. If it is set this can make problems when compiling Geant3 @@ -178,7 +178,7 @@ create_installation_directories ######################## CMake ################################ # This is only for safety reasons. If we find a machine where -# cmake is not installed, we install cmake and add the path +# cmake is not installed, we install cmake and add the path # to the environment variable PATH if [ "$check" = "1" ]; @@ -190,54 +190,54 @@ fi if [ "$check" = "1" ]; then - source scripts/install_gtest.sh + source scripts/install_gtest.sh fi ############ GNU scientific library ############################### if [ "$check" = "1" ]; then - source scripts/install_gsl.sh + source scripts/install_gsl.sh fi ############ ICU libraries ############################### if [ "$check" = "1" -a "$compiler" = "Clang" -a "$platform" = "linux" ]; then - source scripts/install_icu.sh + source scripts/install_icu.sh fi ############ Boost libraries ############################### if [ "$check" = "1" ]; then - source scripts/install_boost.sh + source scripts/install_boost.sh fi ##################### Pythia 6 ############################################# if [ "$check" = "1" -a "$onlyreco" = "0" ]; then - source scripts/install_pythia6.sh + source scripts/install_pythia6.sh fi ##################### HepMC ## ############################################# if [ "$check" = "1" -a "$onlyreco" = "0" ]; then - source scripts/install_hepmc.sh + source scripts/install_hepmc.sh fi ##################### Pythia 8 ############################################# if [ "$check" = "1" -a "$onlyreco" = "0" ]; then - source scripts/install_pythia8.sh + source scripts/install_pythia8.sh fi ##################### XercesC ############################################# -if [ "$build_python" = "yes" ]; +if [ "$build_python" = "yes" ]; then if [ "$check" = "1" -a "$onlyreco" = "0" ]; then @@ -249,7 +249,7 @@ fi if [ "$check" = "1" -a "$compiler" = "Clang" -a "$platform" = "linux" ]; then - source scripts/install_mesa.sh + source scripts/install_mesa.sh fi ##################### GEANT 4 ############################################# @@ -275,7 +275,7 @@ fi ##################### G4Py ############################################# -if [ "$build_python" = "yes" ]; +if [ "$build_python" = "yes" ]; then if [ "$check" = "1" -a "$onlyreco" = "0" ]; then @@ -356,4 +356,4 @@ then else echo "*** End installation of external packages with Errors***" | tee -a $logfile exit 42 -fi +fi diff --git a/make_clean.sh b/make_clean.sh index 25efcc40b..b96db1395 100755 --- a/make_clean.sh +++ b/make_clean.sh @@ -6,7 +6,7 @@ # If you choose to remove e.g. the root package the script will run "make clean" # in the base directory of root. It will also remove all innstalled files in # SIMPATH_INSTALL and the calls the function for all packges which depends on -# the root package, e.g. pluto. +# the root package, e.g. pluto. #### @@ -23,13 +23,13 @@ main() { if [ $# -eq 2 ]; then rm_installed_files=true - else + else rm_installed_files=false - fi + fi - # Extract the directory where the script is loacted + # Extract the directory where the script is loacted SIMPATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) - + if [ -e $SIMPATH/config.cache ]; then source $SIMPATH/config.cache else @@ -40,13 +40,13 @@ main() { source $SIMPATH/scripts/package_versions.sh source $SIMPATH/scripts/functions.sh echo "Check if all variables are properly defined in config.cache." - check_variables + check_variables echo "All variables are properly defined in config.cache." check_package_exist $package clean_$package - + cd $SIMPATH_INSTALL if [ -e bin/fairsoft-config ]; then @@ -55,7 +55,7 @@ main() { fi find $SIMPATH_INSTALL -type d -empty -delete - + # Remove symbolic link if libdir doesn't exist any longer if [ ! -e lib -a -L lib64 ]; then rm -f lib64 @@ -75,20 +75,20 @@ print_help() { echo " ./make_clean_install.sh all" echo "If the installed and temporary files of all packages should" echo "be rmoved the command is" - echo " ./make_clean_install.sh all true" + echo " ./make_clean_install.sh all true" echo "" echo "" } clean_cmake() { - echo "Remove temporary files from package CMake" + echo "Remove temporary files from package CMake" if [ -e $SIMPATH/basics/cmake ]; then cd $SIMPATH/basics/cmake make clean fi - + if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package CMake" + echo "Remove installed files from package CMake" if [ -e $SIMPATH_INSTALL/bin/cmake ]; then cd $SIMPATH/basics/cmake make uninstall @@ -99,29 +99,29 @@ clean_cmake() { } clean_gtest() { - echo "Remove temporary files from package gtest" + echo "Remove temporary files from package gtest" if [ -e $SIMPATH/basics/gtest/build ]; then rm -rf $SIMPATH/basics/gtest/build fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package gtest" + echo "Remove installed files from package gtest" cd $SIMPATH_INSTALL - rm -rf include/gtest + rm -rf include/gtest rm -f lib/libgtest*.a fi } clean_gsl() { - echo "Remove temporary files from package gsl" + echo "Remove temporary files from package gsl" if [ -e $SIMPATH/basics/gsl ]; then cd $SIMPATH/basics/gsl make clean fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package gsl" + echo "Remove installed files from package gsl" if [ -e $SIMPATH_INSTALL/bin/gsl-config ]; then cd $SIMPATH/basics/gsl make uninstall @@ -129,7 +129,7 @@ clean_gsl() { rm -f libgsl*.so cd $SIMPATH_INSTALL/share/info rm -f dir - fi + fi fi clean_root @@ -137,8 +137,8 @@ clean_gsl() { clean_icu() { if [ "$compiler" = "Clang" -a "$platform" = "linux" ]; then - echo "Remove temporary files from package icu" - echo "Remove installed files from package icu" + echo "Remove temporary files from package icu" + echo "Remove installed files from package icu" echo "Not implemented yet" # Boost depends on some systems on icu # Needed only for linux + clang @@ -149,73 +149,73 @@ clean_icu() { } clean_boost() { - echo "Remove temporary files from package boost" - if [ -e $SIMPATH/basics/boost ]; then + echo "Remove temporary files from package boost" + if [ -e $SIMPATH/basics/boost ]; then cd $SIMPATH/basics #./b2 --clean install rm -rf boost $BOOSTVERSION fi - + if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package boost" + echo "Remove installed files from package boost" if [ -e $SIMPATH_INSTALL/include/boost ]; then cd $SIMPATH_INSTALL rm -rf include/boost rm -f lib/libboost* fi - fi + fi } clean_pythia6() { - echo "Remove temporary files from package pythia6" - if [ -e $SIMPATH/generators/pythia6/build ]; then + echo "Remove temporary files from package pythia6" + if [ -e $SIMPATH/generators/pythia6/build ]; then rm -rf $SIMPATH/generators/pythia6/build fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package pythia6" - if [ -e $SIMPATH_INSTALL/lib/libPythia6.so ]; then + echo "Remove installed files from package pythia6" + if [ -e $SIMPATH_INSTALL/lib/libPythia6.so ]; then rm -f $SIMPATH_INSTALL/lib/libPythia6* fi - fi + fi clean_root } clean_hepmc() { - echo "Remove temporary files from package hepmc" - if [ -e $SIMPATH/generators/build_HepMC ]; then + echo "Remove temporary files from package hepmc" + if [ -e $SIMPATH/generators/build_HepMC ]; then rm -rf $SIMPATH/generators/build_HepMC fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package hepmc" - if [ -e $SIMPATH_INSTALL/lib/libHepMC.a ]; then + echo "Remove installed files from package hepmc" + if [ -e $SIMPATH_INSTALL/lib/libHepMC.a ]; then rm -rf $SIMPATH_INSTALL/include/HepMC rm -rf $SIMPATH_INSTALL/share/HepMC rm -f $SIMPATH_INSTALL/lib/libHepMC* fi - fi + fi clean_pythia8 } clean_pythia8() { if [ ! $pythia8_cleaned ]; then - echo "Remove temporary files from package pythia8" - if [ -e $SIMPATH/generators/pythia8/lib ]; then + echo "Remove temporary files from package pythia8" + if [ -e $SIMPATH/generators/pythia8/lib ]; then cd $SIMPATH/generators/pythia8 make distclean fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package pythia8" - if [ -e $SIMPATH_INSTALL/lib/libpythia8.so ]; then + echo "Remove installed files from package pythia8" + if [ -e $SIMPATH_INSTALL/lib/libpythia8.so ]; then rm -rf $SIMPATH_INSTALL/include/Pythia8 rm -rf $SIMPATH_INSTALL/share/pythia8 rm -f $SIMPATH_INSTALL/lib/libpythia8* rm -f $SIMPATH_INSTALL/lib/liblhapdfdummy* fi - fi + fi clean_root pythia8_cleaned=true fi @@ -225,15 +225,15 @@ clean_xercesc() { if [ "$build_python" = "yes" ]; then if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package xercesc" + echo "Remove installed files from package xercesc" cd $SIMPATH/basics/xercesc make uninstall cd $SIMPATH_INSTALL/lib rm -f libxerces* fi - echo "Remove temporary files from package xercesc" - if [ -e $SIMPATH/basics/xercesc ]; then + echo "Remove temporary files from package xercesc" + if [ -e $SIMPATH/basics/xercesc ]; then cd $SIMPATH/basics/xercesc make clean fi @@ -245,8 +245,8 @@ clean_xercesc() { clean_mesa() { if [ "$compiler" = "Clang" -a "$platform" = "linux" ]; then - echo "Remove temporary files from package mesa" - echo "Remove installed files from package mesa" + echo "Remove temporary files from package mesa" + echo "Remove installed files from package mesa" echo "Not implemented yet" # Geant4 and Root depend on Mesa/OpenGl # needed only for linux + clang @@ -260,14 +260,14 @@ clean_mesa() { clean_geant4() { if [ ! $geant4_cleaned ]; then - echo "Remove temporary files from package geant4" - if [ -e $SIMPATH/transport/geant4/build ]; then + echo "Remove temporary files from package geant4" + if [ -e $SIMPATH/transport/geant4/build ]; then rm -rf $SIMPATH/transport/geant4/build fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package geant4" - if [ -e $SIMPATH_INSTALL/lib/libG3toG4.so ]; then + echo "Remove installed files from package geant4" + if [ -e $SIMPATH_INSTALL/lib/libG3toG4.so ]; then rm -rf $SIMPATH_INSTALL/include/Geant4 rm -r $SIMPATH_INSTALL/share/Geant4 rm -rf $SIMPATH_INSTALL/share/$GEANT4VERSIONp @@ -276,7 +276,7 @@ clean_geant4() { rm -f $SIMPATH_INSTALL/lib/libG3toG4* rm -rf $SIMPATH_INSTALL/lib/$GEANT4VERSIONp fi - fi + fi # Root, vgm and geant4_vmc depend on geant4 clean_root @@ -290,7 +290,7 @@ clean_geant4() { clean_xrootd() { if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package xrootd" + echo "Remove installed files from package xrootd" cd $SIMPATH_INSTALL/bin rm -f cconfig cmsd cns_ssi frm_admin frm_purged frm_xfragent frm_xfrd mpxstats wait41 xprep xrd xrdadler32 XrdCnsd xrdcopy xrdcp xrdcp-old xrdfs xrdgsiproxy xrdmapc xrdpwdadmin xrdsssadmin xrdstagetool xrootd xrootd-config cd $SIMPATH_INSTALL/include @@ -313,7 +313,7 @@ clean_root() { if [ ! $root_cleaned ]; then if [ "$rm_installed_files" = "true" -a -e $SIMPATH/tools/root ]; then - echo "Remove installed files from package root" + echo "Remove installed files from package root" cd $SIMPATH_INSTALL rm -rf lib/root rm -f lib/libVc.a @@ -321,20 +321,20 @@ clean_root() { rm -rf share/root rm -rf share/doc/root rm -f share/emacs/site-lisp/root-help.el - rm -rf share/aclocal/root.m4 + rm -rf share/aclocal/root.m4 cd $SIMPATH_INSTALL/bin rm -f root* thisroot.sh thisroot.csh genreflex-rootcint g2root h2root xproofd setxrd.sh setxrd.csh setenvwrap.csh rm -f proofserv memprobe genreflex rlibmap rmkdepend proofd ssh2rpd proofserv.exe hadd hist2workspace prepareHistFactory cd $SIMPATH_INSTALL/share/man/man1 rm -f cint.1 h2root.1 pq2-cache.1 pq2-redistribute.1 proofserv.1 root.exe.1 setup-pq2.1 g2root.1 hadd.1 pq2-info-server.1 rm -f pq2-rm.1 proofserva.1 roota.1 ssh2rpd.1 g2rootold.1 hist2workspace.1 pq2-ls-files-server.1 pq2-verify.1 rlibmap.1 - rm -f rootcint.1 system.rootdaemonrc.1 genmap.1 makecint.1 pq2-ls-files.1 pq2.1 rmkdepend.1 rootd.1 xpdtest.1 + rm -f rootcint.1 system.rootdaemonrc.1 genmap.1 makecint.1 pq2-ls-files.1 pq2.1 rmkdepend.1 rootd.1 xpdtest.1 rm -f genreflex-rootcint.1 memprobe.1 pq2-ls.1 prepareHistFactory.1 root-config.1 rootn.exe.1 xproofd.1 genreflex.1 rm -f pq2-ana-dist.1 pq2-put.1 proofd.1 root.1 roots.exe.1 fi - echo "Remove temporary files from package root" - if [ -e $SIMPATH/tools/root ]; then + echo "Remove temporary files from package root" + if [ -e $SIMPATH/tools/root ]; then cd $SIMPATH/tools/root rm -rf build_for_fair fi @@ -342,7 +342,7 @@ clean_root() { clean_pluto clean_vgm clean_geant4_vmc - clean_geant3 + clean_geant3 root_cleaned=true fi } @@ -351,14 +351,14 @@ clean_g4py() { if [ ! $g4py_cleaned ]; then if [ "$build_python" = "yes" ]; then - echo "Remove temporary files from package g4py" - if [ -e $SIMPATH/transport/geant4/build_g4py ]; then + echo "Remove temporary files from package g4py" + if [ -e $SIMPATH/transport/geant4/build_g4py ]; then rm -rf $SIMPATH/transport/geant4/build_g4py fi - + if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package g4py" - if [ -e $SIMPATH_INSTALL/lib/g4py ]; then + echo "Remove installed files from package g4py" + if [ -e $SIMPATH_INSTALL/lib/g4py ]; then rm -rf $SIMPATH_INSTALL/lib/g4py rm -rf $SIMPATH_INSTALL/lib/Geant4 fi @@ -372,7 +372,7 @@ clean_g4py() { clean_pluto() { if [ ! $pluto_cleaned ]; then - echo "Remove temporary files from package pluto" + echo "Remove temporary files from package pluto" if [ -e $SIMPATH/generators/pluto/Makefile ]; then cd $SIMPATH/generators/pluto make clean @@ -380,8 +380,8 @@ clean_pluto() { fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package pluto" - if [ -e $SIMPATH_INSTALL/lib/libPluto.a ]; then + echo "Remove installed files from package pluto" + if [ -e $SIMPATH_INSTALL/lib/libPluto.a ]; then rm -f $SIMPATH_INSTALL/lib/libPluto* rm -rf $SIMPATH_INSTALL/include/pluto fi @@ -394,13 +394,13 @@ clean_pluto() { clean_geant3() { if [ ! $geant3_cleaned ]; then - echo "Remove temporary files from package geant3" + echo "Remove temporary files from package geant3" if [ -e $SIMPATH/transport/geant3/build ]; then rm -rf $SIMPATH/transport/geant3/build fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package geant3" - if [ -e $SIMPATH_INSTALL/lib/libgeant321.so ]; then + echo "Remove installed files from package geant3" + if [ -e $SIMPATH_INSTALL/lib/libgeant321.so ]; then rm -f $SIMPATH_INSTALL/lib/libgeant321* rm -rf $SIMPATH_INSTALL/include/TGeant3 rm -rf $SIMPATH_INSTALL/lib/Geant3-2.0.0 @@ -412,13 +412,13 @@ clean_geant3() { clean_vgm() { if [ ! $vgm_cleaned ]; then - echo "Remove temporary files from package vgm" + echo "Remove temporary files from package vgm" if [ -e $SIMPATH/transport/vgm/build_cmake ]; then rm -rf $SIMPATH/transport/vgm/build_cmake fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package vgm" - if [ -e $SIMPATH_INSTALL/lib/libBaseVGM.so ]; then + echo "Remove installed files from package vgm" + if [ -e $SIMPATH_INSTALL/lib/libBaseVGM.so ]; then rm -f $SIMPATH_INSTALL/lib/lib*GM.* rm -rf $SIMPATH_INSTALL/lib/VGM-4.2.0 rm -rf $SIMPATH_INSTALL/include/*GM @@ -433,14 +433,14 @@ clean_vgm() { clean_geant4_vmc() { if [ ! $geant4_vmc_cleaned ]; then - echo "Remove temporary files from package geant4_vmc" + echo "Remove temporary files from package geant4_vmc" if [ -e $SIMPATH/transport/geant4_vmc/build ]; then rm -rf $SIMPATH/transport/geant4_vmc/build fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package geant4_vmc" - if [ -e $SIMPATH_INSTALL/lib/libg4root.so ]; then + echo "Remove installed files from package geant4_vmc" + if [ -e $SIMPATH_INSTALL/lib/libg4root.so ]; then rm -rf $SIMPATH_INSTALL/include/geant4vmc rm -rf $SIMPATH_INSTALL/include/mtroot rm -rf $SIMPATH_INSTALL/include/g4root @@ -469,7 +469,7 @@ clean_geant4_vmc() { } clean_millipede() { - echo "Remove temporary files from package millipede" + echo "Remove temporary files from package millipede" if [ -e $SIMPATH/basics/MillepedeII/build ]; then rm -rf $SIMPATH/basics/MillepedeII/build cd $SIMPATH/basics/MillepedeII @@ -478,8 +478,8 @@ clean_millipede() { fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package millipede" - if [ -e $SIMPATH_INSTALL/lib/libMille.so ]; then + echo "Remove installed files from package millipede" + if [ -e $SIMPATH_INSTALL/lib/libMille.so ]; then rm -f $SIMPATH_INSTALL/lib/libMille.* rm -f $SIMPATH_INSTALL/include/Mille.h rm -f $SIMPATH_INSTALL/bin/pede @@ -488,15 +488,15 @@ clean_millipede() { } clean_zeromq() { - echo "Remove temporary files from package zeromq" + echo "Remove temporary files from package zeromq" if [ -e $SIMPATH/basics/zeromq ]; then cd $SIMPATH/basics/zeromq make clean fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package zeromq" - if [ -e $SIMPATH_INSTALL/lib/libzmq.a ]; then + echo "Remove installed files from package zeromq" + if [ -e $SIMPATH_INSTALL/lib/libzmq.a ]; then cd $SIMPATH/basics/zeromq make uninstall cd $SIMPATH_INSTALL @@ -507,14 +507,14 @@ clean_zeromq() { } clean_protobuf() { - echo "Remove temporary files from package protobuf" + echo "Remove temporary files from package protobuf" if [ -e $SIMPATH/basics/protobuf ]; then cd $SIMPATH/basics/protobuf make clean fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package protobuf" - if [ -e $SIMPATH_INSTALL/bin/protoc ]; then + echo "Remove installed files from package protobuf" + if [ -e $SIMPATH_INSTALL/bin/protoc ]; then cd $SIMPATH/basics/protobuf make uninstall fi @@ -523,15 +523,15 @@ clean_protobuf() { clean_nanomsg() { - echo "Remove temporary files from package nanomsg" + echo "Remove temporary files from package nanomsg" if [ -e $SIMPATH/basics/nanomsg ]; then cd $SIMPATH/basics/nanomsg make clean fi if [ "$rm_installed_files" = "true" ]; then - echo "Remove installed files from package nanomsg" - if [ -e $SIMPATH_INSTALL/bin/nanocat ]; then + echo "Remove installed files from package nanomsg" + if [ -e $SIMPATH_INSTALL/bin/nanocat ]; then cd $SIMPATH/basics/nanomsg make uninstall rm -f $SIMPATH_INSTALL/bin/nn_* @@ -558,10 +558,10 @@ check_package_exist() { for pack in $valid_packages do if [ "$1" = "$pack" ]; then - return + return fi done - + echo "The package \"$1\" is not a valid package name." echo "Valid package names are: " for pack in $valid_packages diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 4c4bf8df9..526495456 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -2,6 +2,6 @@ Cmake_Minimum_Required(VERSION 2.6.0 FATAL_ERROR) Project(SVN_VERSION NONE) -set(CMAKE_MODULE_PATH "$ENV{SIMPATH}/scripts") +set(CMAKE_MODULE_PATH "$ENV{SIMPATH}/scripts") include(GenerateVersionInfo) diff --git a/scripts/Test_CMakeLists.txt b/scripts/Test_CMakeLists.txt index d5bf4088f..d726aa9ee 100644 --- a/scripts/Test_CMakeLists.txt +++ b/scripts/Test_CMakeLists.txt @@ -2,7 +2,7 @@ # and the existence of the new standard template library libc++ # The script is working with cmake 2.6.4 and 2.8.10, -# so it should work also with all versions in between +# so it should work also with all versions in between CMake_Minimum_Required(VERSION 2.6 FATAL_ERROR) Project(TestEnvironment C CXX) @@ -26,7 +26,7 @@ If( fc_needed ) Set(ALL_COMPILER_FOUND TRUE) Else() Message(WARNING "Found GCC Version < 4.8") - Message(WARNING "At least GCC 4.8 is needed.") + Message(WARNING "At least GCC 4.8 is needed.") EndIf() ElseIf("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") Execute_process(COMMAND ${CMAKE_C_COMPILER} --version @@ -47,7 +47,7 @@ If( fc_needed ) Set(ALL_COMPILER_FOUND TRUE) Else() Message(WARNING "Found Clang Version < 3.4") - Message(WARNING "At least Clang 3.4 is needed.") + Message(WARNING "At least Clang 3.4 is needed.") EndIf() EndIf() Get_Filename_Component(_FC ${CMAKE_Fortran_COMPILER} NAME) @@ -75,7 +75,7 @@ if (NOT Build_batch) #Check for OpenGL and GLU installation find_package(OpenGL) - + If(OPENGL_FOUND AND OPENGL_GLU_FOUND) Message(STATUS "Found all necessary OpenGL features.") Set(COMPLETE_OPENGL_FOUND TRUE) @@ -87,7 +87,7 @@ EndIf() #---Check for needed programs -Find_Program(WGET_FOUND NAMES wget) +Find_Program(WGET_FOUND NAMES wget) Find_Program(CURL_FOUND NAMES curl) If(WGET_FOUND OR CURL_FOUND) Set(DOWNLOADER_FOUND TRUE) @@ -96,21 +96,21 @@ If(WGET_FOUND OR CURL_FOUND) EndIf() EndIf() -Find_Program(MAKE_FOUND NAMES make) +Find_Program(MAKE_FOUND NAMES make) -Find_Program(BZIP2_FOUND NAMES bzip2) -Find_Program(GZIP_FOUND NAMES gzip) -Find_Program(UNZIP_FOUND NAMES unzip) -Find_Program(TAR_FOUND NAMES tar) +Find_Program(BZIP2_FOUND NAMES bzip2) +Find_Program(GZIP_FOUND NAMES gzip) +Find_Program(UNZIP_FOUND NAMES unzip) +Find_Program(TAR_FOUND NAMES tar) If(TAR_FOUND AND UNZIP_FOUND AND GZIP_FOUND AND BZIP2_FOUND) - Set(UNPACKER_FOUND TRUE) + Set(UNPACKER_FOUND TRUE) Endif() -Find_Program(SVN_FOUND NAMES svn) -Find_Program(GIT_FOUND NAMES git) +Find_Program(SVN_FOUND NAMES svn) +Find_Program(GIT_FOUND NAMES git) -Find_Program(PATCH_FOUND NAMES patch) +Find_Program(PATCH_FOUND NAMES patch) Find_Package(OpenSSL) @@ -118,11 +118,11 @@ Find_Package(OpenSSL) # Mesa needs some additional programs, so we have to theck for them Set(SPECIAL_CLANG_LINUX_FOUND TRUE) If(CMAKE_CXX_COMPILER MATCHES "clang\\+\\+" AND CMAKE_SYSTEM_NAME MATCHES "Linux") - Find_Program(MAKEDEP_FOUND NAMES makedepend) - Find_Program(FLEX_FOUND NAMES flex) - Find_Program(BISON_FOUND NAMES bison) + Find_Program(MAKEDEP_FOUND NAMES makedepend) + Find_Program(FLEX_FOUND NAMES flex) + Find_Program(BISON_FOUND NAMES bison) If(NOT MAKEDEP_FOUND OR NOT FLEX_FOUND OR NOT BISON_FOUND) - Set(SPECIAL_CLANG_LINUX_FOUND FALSE) + Set(SPECIAL_CLANG_LINUX_FOUND FALSE) Endif() Endif() @@ -165,9 +165,9 @@ Else() Message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}") Message(STATUS "libssl and ssl headers must be installed.") EndIf() - + if (NOT Build_batch) - If(NOT OPENGL_FOUND) + If(NOT OPENGL_FOUND) Message(STATUS "OpenGL must be installed ") EndIf() If(NOT OPENGL_GLU_FOUND) @@ -190,8 +190,8 @@ Else() If(NOT UNZIP_FOUND) Message(STATUS "unzip is not found in PATH. You need to install it") EndIf() - If(NOT TAR_FOUND) - Message(STATUS "tar is not found in PATH. You need to install it") + If(NOT TAR_FOUND) + Message(STATUS "tar is not found in PATH. You need to install it") EndIf() If(NOT SVN_FOUND) Message(STATUS "svn is not found in PATH. You need to install it") diff --git a/scripts/fairsoft-config.in b/scripts/fairsoft-config.in index 5497b51e5..a78a67f81 100755 --- a/scripts/fairsoft-config.in +++ b/scripts/fairsoft-config.in @@ -66,4 +66,4 @@ esac ### Output the stuff echo $out - \ No newline at end of file + diff --git a/scripts/install_root.sh b/scripts/install_root.sh index a969f9ddd..7144392cd 100644 --- a/scripts/install_root.sh +++ b/scripts/install_root.sh @@ -212,7 +212,7 @@ then ln -s ../libVc.a echo "---link created --- " else - echo "libVc.a not found in lib dirctory " + echo "libVc.a not found in lib dirctory " fi ##################################### diff --git a/scripts/install_root6.sh b/scripts/install_root6.sh index 8cc0b042f..310a2a6a6 100644 --- a/scripts/install_root6.sh +++ b/scripts/install_root6.sh @@ -28,7 +28,7 @@ then then git checkout 6c5ee53c9df9a5f50ae2b2d7b1fda680342e28b4 fi - fi + fi fi install_prefix=$SIMPATH_INSTALL @@ -115,12 +115,12 @@ then mypatch ../root6_lzma.patch fi - + if [ "$build_root6" = "no" ]; then mypatch ../root5_34_find_xrootd.patch mypatch ../root5_lzma.patch fi - + cd build_for_fair/ . rootconfig.sh @@ -203,7 +203,7 @@ then ln -s ../libVc.a echo "---link created --- " else - echo "libVc.a not found in lib dirctory " + echo "libVc.a not found in lib dirctory " fi #####################################