Commit a730dedc authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'cherry-pick-eed4de7b' into '1.0'

Cherry pick "Merge branch 'ext_klfmerge_master' into 'master'" to 1.0

See merge request !337
parents e777ce6b 7788e083
......@@ -24,7 +24,6 @@ endif()
set( _bat_root ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM} )
# KLFitter source
set( _git_repo https://github.com/KLFitter/KLFitter.git )
set( _version_tag "v1.2.0" )
# Temporary directory for the build results:
......@@ -34,8 +33,8 @@ set( _buildDir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KLFitterBuild
ExternalProject_Add( KLFitter
PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
GIT_REPOSITORY ${_git_repo}
GIT_TAG ${_version_tag}
URL http://cern.ch/atlas-software-dist-eos/externals/KLFitter/${_version_tag}.tar.gz
URL_MD5 b8c8cee9a377429670af8cbe7b5bcf01
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DROOT_ROOT:PATH=${_rootsys}
......
......@@ -30,8 +30,8 @@ set( _buildDir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/lwtnnBuild )
ExternalProject_Add( lwtnn
PREFIX ${CMAKE_BINARY_DIR}
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
GIT_REPOSITORY https://github.com/lwtnn/lwtnn.git
GIT_TAG v2.7.1
URL http://cern.ch/atlas-software-dist-eos/externals/lwtnn/v2.7.1.tar.gz
URL_MD5 0efcafec85753a3c808516c002f28b14
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DEIGEN3_INCLUDE_DIR:PATH=${EIGEN_INCLUDE_DIRS}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment