diff -Nwaur -x '*svn*' lcgcmake-unedited/cmake/toolchain/heptools-common.cmake lcgcmake/cmake/toolchain/heptools-common.cmake
--- lcgcmake-unedited/cmake/toolchain/heptools-common.cmake 2015-08-24 19:02:28.232457227 +0000
+++ lcgcmake/cmake/toolchain/heptools-common.cmake 2015-08-21 13:32:39.029367379 +0000
@@ -72,9 +72,9 @@
set(os "cc")
string(REGEX REPLACE ".*VERSION_ID=\"([0-9]+).*" "\\1" osvers "${os_release}")
else()
- message(WARNING "Unkown OS, assuming 'linux'")
- set(os linux)
- set(osvers)
+ message(WARNING "Unkown OS, assuming 'slc6'")
+ set(os "slc")
+ set(osvers 6)
endif()
endif()
endif()
diff -Nwaur -x '*svn*' lcgcmake-unedited/externals/CMakeLists.txt lcgcmake/externals/CMakeLists.txt
--- lcgcmake-unedited/externals/CMakeLists.txt 2015-08-24 19:02:30.340232572 +0000
+++ lcgcmake/externals/CMakeLists.txt 2015-08-24 15:57:54.703229141 +0000
@@ -295,10 +295,12 @@
URL http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/davix-<NATIVE_VERSION>.tar.gz
CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DBOOST_ROOT:PATHNAME=${Boost_home}
- -DBOOST_INCLUDEDIR=${Boost_home}/include
- -DBOOST_LIBRARYDIR=${Boost_home}/lib
- -DBoost_NO_BOOST_CMAKE=True
+ -DBoost_INCLUDE_DIR:PATH=${Boost_home}/include/boost-1_55
+ -DBoost_LIBRARY_DIR_DEBUG:PATH=${Boost_home}/lib
+ -DBoost_LIBRARY_DIR_RELEASE:PATH=${Boost_home}/lib
+ -DBoost_NO_BOOST_CMAKE:BOOL=True
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
<SOURCE_DIR>
DEPENDS Boost
)
@@ -334,7 +336,7 @@
#set(hepmc3_source_command GIT_REPOSITORY https://:@git.cern.ch/kerberos/hepmc3)
if( hepmc3_native_version MATCHES "githead")
- set(hepmc3_source_command GIT_REPOSITORY http://git.cern.ch/cernpub/hepmc3)
+ set(hepmc3_source_command GIT_REPOSITORY http://git.cern.ch/pub/hepmc3)
else()
set(hepmc3_source_command URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/MCGeneratorsTarFiles/hepmc3-${hepmc3_native_version}.tgz)
endif()
@@ -358,6 +360,8 @@
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DHEPMC_BUILD_EXAMPLES=ON
-DPYTHIA8_ROOT_DIR=${pythia8_home}
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
${hepmc3_options}
BUILD_COMMAND ${MAKE} -j1
DEPENDS ${hepmc3_dependencies}
@@ -839,7 +843,7 @@
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DUNWIND_INCLUDE_DIR:PATH=${libunwind_home}/include
-DUNWIND_LIBRARY:FILEPATH=${libunwind_home}/lib/libunwind.so
- "-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-error=unused-result"
+ "-DCMAKE_CXX_FLAGS=-Wno-unused-variable"# -Wno-error=unused-result"
DEPENDS libunwind
)
diff -Nwaur -x '*svn*' lcgcmake-unedited/generators/CMakeLists.txt lcgcmake/generators/CMakeLists.txt
--- lcgcmake-unedited/generators/CMakeLists.txt 2015-08-24 19:02:35.483031899 +0000
+++ lcgcmake/generators/CMakeLists.txt 2015-08-21 01:39:32.500439326 +0000
@@ -1677,6 +1677,9 @@
URL ${gen_url}/crmc.v<NATIVE_VERSION>.tar.gz
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DROOTSYS=${ROOT_home}
-DHEPMC_PREFIX=${HepMC_home}
-DBOOST_ROOT=${Boost_home}
diff -Nwaur -x '*svn*' lcgcmake-unedited/projects/CMakeLists.txt lcgcmake/projects/CMakeLists.txt
--- lcgcmake-unedited/projects/CMakeLists.txt 2015-08-24 19:02:35.624216544 +0000
+++ lcgcmake/projects/CMakeLists.txt 2015-08-24 13:27:49.479842060 +0000
@@ -97,6 +97,8 @@
${graphviz_home} ${GSL_home} ${Qt_home} ${CASTOR_home} ${dcap_home}
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-Dpython=ON
-Dbuiltin_pcre=ON
-Dcintex=ON
@@ -184,6 +186,8 @@
UPDATE_COMMAND <VOID>
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_MODULE_PATH=${cmaketools_home}/modules
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DROOTSYS=${ROOT_home}
# -DGCCXML=${GCCXML_home}/bin/gccxml
IF DEFINED GCCXML_native_version THEN
diff -Nwaur -x '*svn*' lcgcmake-unedited/toolchain.cmake lcgcmake/toolchain.cmake
--- lcgcmake-unedited/toolchain.cmake 2015-08-24 19:02:35.670428000 +0000
+++ lcgcmake/toolchain.cmake 2015-08-21 01:12:00.031530000 +0000
@@ -1,5 +1,5 @@
# Special wrapper to load the declared version of the heptools toolchain.
-set(LCG_VERSION dev2 CACHE STRING "HepTools version (aka LCG configuration)")
+set(LCG_VERSION 78root6 CACHE STRING "HepTools version (aka LCG configuration)")
# Remove the reference to this file from the cache.
unset(CMAKE_TOOLCHAIN_FILE CACHE)