req for gcc when clik compiled with gfort/atlas- pico still hardcoded

cmt/camel_setup.sh

@@ -4,10 +4,11 @@
 export PYTHONPATH=${PICO_CODE}:$PYTHONPATH
 
 #common
-export CLIKDIR
 source $CLIKDIR/bin/clik_profile.sh
-export CLIKCFLAGS=`$CLIKDIR/bin/clik-config --cflags`
-export CLIKLIBS=$($CLIKDIR/bin/clik-config --libs | sed 's/,-Bdynamic-Wl//g')
+CLIKCFLAGS=`$CLIKDIR/bin/clik-config --cflags`
+export CLIKCFLAGS
+CLIKLIBS=$($CLIKDIR/bin/clik-config --libs | sed 's/,-Bdynamic-Wl//g')
+export CLIKLIBS
 
 echo "Using Planck code from: $CLIKDIR"
 

cmt/requirements-gcc-atlas

+package CAMEL
+
+use class v2.4.3
+
+#compiler options
+#macro cpp "icpc"
+#macro cppflags " -O2  -ip -ansi_alias -align -Wbrief "
+
+macro cppflags " -O2 -pipe -ansi -Woverloaded-virtual "
+macro cflags  " -O2  -fopenmp "
+
+
+#CAMEL includes
+include_dirs " ../src"
+include_dirs "../src/Main"
+include_dirs "../src/Minuit2-5.28.00/src"
+include_dirs "../src/Minuit2-5.28.00/inc"
+include_dirs  "../src/cxxsupport"
+include_dirs  "../src/AbsRand"
+include_dirs  "../src/Main/JLA"
+include_dirs  "../src/Main/JLA/jla_likelihood_v3/src"
+
+
+#cfitsio
+#include_dirs "$(CLIKDIR)/include"
+#macro_append  CAMEL_linkopts " -lcfitsio "
+
+#JLA :needs cblas/lapack
+macro_append cppflags ' -DJLA '
+#macro_append CAMEL_linkopts " -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -ljla "
+include_dirs  "/usr/include/atlas"
+macro_append  CAMEL_linkopts " -L/usr/lib64/atlas -lcblas -llapack -ljla "
+
+
+#PLANCK
+macro_append cppflags " -DCLIK  $(CLIKCFLAGS)"
+macro_append cflags " -DCLIK  $(CLIKCFLAGS)"
+macro_append  CAMEL_linkopts " $(CLIKLIBS) "
+macro_append  CAMEL_linkopts "-L$(CLIKDIR)/lib -lcfitsio -lclik "
+
+#include_dirs "$(CLIKDIR)/include"
+#include_dirs  "$(CLIKDIR)/src"
+#macro_append cppflags " -DCLIK "
+#macro_append cflags " -DCLIK "
+#macro_append  CAMEL_linkopts "-L$(CLIKDIR)/lib -lclik "
+#path_append LD_LIBRARY_PATH "$(CLIKDIR)/lib"
+
+
+# PICO #still hardcoded
+include_dirs "/usr/include/python2.7"
+include_dirs "/usr/lib64/python2.7/site-packages/numpy/core/include"
+include_dirs "/home/plaszczy/.local/lib/python2.7/site-packages/pypico"
+macro_append CAMEL_linkopts " -L/home/plaszczy/softs/pypico-3.2.0/build/temp.linux-x86_64-2.7 -lpico -L/usr/lib64/python2.7/config -lpython2.7 "
+macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
+
+
+#CAMEL LIBRARIES
+library Minuit -no_share ../src/Minuit2-5.28.00/src/*.cxx
+library Util -no_share -x=ddl.cc ../src/cxxsupport/*.cc
+library AbsRand -no_share ../src/AbsRand/*.cc
+library CLHEP -no_share ../src/CLHEP/src/*.cc
+library jla  -no_share ../src/Main/JLA/jla_likelihood_v3/src/ini.c ../src/Main/JLA/jla_likelihood_v3/src/jla.cc
+
+macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
+library MinuitFit  -no_share -s=../src/Main $(camelsrc)
+library MCMC  -no_share  -s=../src/Main/MCMC *.cc
+
+macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
+macro_append cppflags ' -DPARFILE=\"$(CAMELROOT)/par\" '
+
+
+#CAMEL applications
+# pour relinker si changement: toutes les application du package
+macro CAMEL_stamps $(PACKAGE_ROOT)/$(CMTCONFIG)/MinuitFit.stamp
+macro application_suffix ""
+
+#groupe exec
+application writeChi2 -group=exec -s=../src/Main exec/writeChi2.cc
+application writeSpectra -group=exec -s=../src/Main exec/writeSpectra.cc
+application Minimize -group=exec -s=../src/Main exec/Minimize.cc
+application ScanParam -group=exec -s=../src/Main exec/ScanParam.cc
+application mcmc -group=exec -s=../src/Main/MCMC exec/mainMCMC.cc
+
+#tests
+application testKlass -group=test -s=../src/Main test/testKlass.cc
+application testCLHEP -group=test -s=../src/Main/test testCLHEP.cc
+application testBAO -group=test -s=../src/Main/test testBAO.cc
+application testHiLLiPOP -group=test -s=../src/Main/test testHiLLiPOP.cc
+application test_clik -group=test -s=../src/Main test/test_clik.cc
+application test_lensing -group=test -s=../src/Main test/test_lensing.cc
+application test_jla -group=test -s=../src/Main test/test_jla.cc
+application testPico -group=test -s=../src/Main/pico/exec testPico.cc
+
+#lIST OF ALL DEPENDENCIES
+macro_append Minimize_dependencies " MinuitFit "
+macro_append ScanParam_dependencies " MinuitFit "
+macro_append writeChi2_dependencies " MinuitFit "
+macro_append writeSpectra_dependencies " MinuitFit "
+macro_append mcmc_dependencies " MinuitFit MCMC"
+macro_append testKlass_dependencies " MinuitFit"
+macro_append clik_example_CC_dependencies " MinuitFit "
+macro_append test_clik_dependencies " MinuitFit "
+macro_append test_lensing_dependencies " MinuitFit "
+macro_append testCLHEP_dependencies " CLHEP "
+macro_append testBAO_dependencies " MinuitFit "
+macro_append testHiLLiPOP_dependencies " MinuitFit "
+macro_append test_jla_dependencies " MinuitFit "
+macro_append testPico_dependencies " MinuitFit "
+