No OneTemporary
Actions

Size

17 KB

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 2f62bb1..b8cb81d 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,255 +1,255 @@
	cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

	set(CMAKE_LEGACY_CYGWIN_WIN32 0)
	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

	project("HEJ" VERSION 2.0.4 LANGUAGES C CXX)

	# Set a default build type if none was specified
	set(default_build_type "RelWithDebInfo")

	if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
	message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
	set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
	STRING "Choose the type of build." FORCE)
	# Set the possible values of build type for cmake-gui
	set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
	"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
	endif()

	## Flags for the compiler. No warning allowed.
	if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
	elseif (MSVC)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /EHsc")
	endif()
	set(CMAKE_CXX_STANDARD_REQUIRED ON)
	set(CMAKE_CXX_STANDARD 14)

	## Create Version
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")


	# Get the latest abbreviated commit hash of the working branch
	execute_process(
	COMMAND git rev-parse HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_REVISION
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)
	# Get the current working branch
	execute_process(
	COMMAND git rev-parse --abbrev-ref HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_BRANCH
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)

	## target directories for install
	set(INSTALL_INCLUDE_DIR_BASE include)
	set(INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR_BASE}/HEJ)
	set(INSTALL_BIN_DIR bin)
	set(INSTALL_LIB_DIR lib)
	set(INSTALL_CONFIG_DIR lib/cmake/HEJ)

	## Template files
	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/Version.hh.in
	${PROJECT_BINARY_DIR}/include/HEJ/Version.hh @ONLY )

	configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/HEJ-config.cc.in
	${PROJECT_BINARY_DIR}/src/bin/HEJ-config.cc @ONLY )

	# Generate CMake config file
	include(CMakePackageConfigHelpers)
	configure_package_config_file(
	cmake/Templates/hej-config.cmake.in
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config.cmake
	INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
	PATH_VARS INSTALL_INCLUDE_DIR_BASE INSTALL_LIB_DIR
	)
	write_basic_package_version_file(
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config-version.cmake
	COMPATIBILITY SameMajorVersion
	)
	install(
	FILES ${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config.cmake
	${CMAKE_CURRENT_BINARY_DIR}/${INSTALL_CONFIG_DIR}/hej-config-version.cmake
	DESTINATION ${INSTALL_CONFIG_DIR})

	## Add directories and find dependences
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include)

	find_package(fastjet REQUIRED)
	-include_directories(${fastjet_INCLUDE_PATH})
	+include_directories(${fastjet_INCLUDE_DIRS})
	find_package(clhep 2.3 REQUIRED)
	-include_directories(${CLHEP_INCLUDE_PATH})
	+include_directories(${CLHEP_INCLUDE_DIRS})
	find_package(lhapdf REQUIRED)
	-include_directories(${lhapdf_INCLUDE_PATH})
	+include_directories(${lhapdf_INCLUDE_DIRS})
	## Amend unintuitive behaviour of FindBoost.cmake
	## Priority of BOOST_ROOT over BOOSTROOT matches FindBoost.cmake
	## at least for cmake 3.12
	if(DEFINED BOOST_ROOT)
	message("BOOST_ROOT set - only looking for Boost in ${BOOST_ROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	elseif(DEFINED BOOSTROOT)
	message("BOOSTROOT set - only looking for Boost in ${BOOSTROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	endif()
	find_package(Boost REQUIRED COMPONENTS iostreams)
	include_directories(${Boost_INCLUDE_DIRS})
	find_package(yaml-cpp)
	include_directories(${YAML_CPP_INCLUDE_DIR})
	find_package(HepMC 2)
	if(${HepMC_FOUND})
	message (STATUS "HepMC installation found: ${HepMC_INCLUDE_DIRS}")
	set(
	CMAKE_CXX_FLAGS
	"${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_HepMC_VERSION=${HepMC_VERSION_MAJOR}"
	)
	include_directories(${HepMC_INCLUDE_DIRS})
	find_package(rivet)
	if(${rivet_FOUND})
	include_directories(${rivet_INCLUDE_DIRS})
	set(
	CMAKE_CXX_FLAGS
	"${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_RIVET"
	)
	endif()
	endif()
	find_package(QCDloop 2)
	if(${QCDloop_FOUND})
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_QCDLOOP")
	include_directories(SYSTEM ${QCDloop_INCLUDE_DIRS})
	endif()

	add_subdirectory(src)

	## define executable
	add_executable(HEJ src/bin/HEJ.cc)

	## link libraries
	target_link_libraries(HEJ hejlib)

	add_executable(HEJ-config src/bin/HEJ-config.cc)

	file(GLOB hej_headers ${CMAKE_CURRENT_SOURCE_DIR}/include/HEJ/.hh ${PROJECT_BINARY_DIR}/include/HEJ/.hh)
	file(GLOB lhef_headers ${CMAKE_CURRENT_SOURCE_DIR}/include/LHEF/*.h)
	install(FILES ${hej_headers} DESTINATION ${INSTALL_INCLUDE_DIR})
	install(FILES ${lhef_headers} DESTINATION include/LHEF/)
	install(TARGETS HEJ HEJ-config DESTINATION ${INSTALL_BIN_DIR})

	## tests
	enable_testing()
	set(tst_dir "${CMAKE_CURRENT_SOURCE_DIR}/t")
	add_executable(test_classify ${tst_dir}/test_classify.cc)
	add_executable(test_psp ${tst_dir}/test_psp.cc)
	add_executable(test_ME_generic ${tst_dir}/test_ME_generic.cc)
	add_executable(check_res ${tst_dir}/check_res.cc)
	add_executable(check_lhe ${tst_dir}/check_lhe.cc)
	add_library(scales SHARED ${tst_dir}/scales.cc)
	add_executable(test_scale_import ${tst_dir}/test_scale_import)
	add_executable(test_descriptions ${tst_dir}/test_descriptions)
	add_executable(test_scale_arithmetics ${tst_dir}/test_scale_arithmetics)
	target_link_libraries(test_classify hejlib)
	target_link_libraries(test_psp hejlib)
	target_link_libraries(test_ME_generic hejlib)
	target_link_libraries(check_res hejlib)
	target_link_libraries(check_lhe hejlib)
	target_link_libraries(test_scale_import hejlib)
	target_link_libraries(test_descriptions hejlib)
	target_link_libraries(test_scale_arithmetics hejlib)

	## add tests
	add_test(
	NAME t_classify
	COMMAND test_classify ${tst_dir}/classify.lhe.gz
	)
	add_test(
	NAME t_psp
	COMMAND test_psp ${tst_dir}/psp_gen.lhe.gz
	)
	set(tst_ME_data_dir "${tst_dir}/ME_data")
	add_test(
	NAME t_ME_j
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtinf.yml ${tst_ME_data_dir}/ME_jets.dat ${tst_ME_data_dir}/PSP_jets.lhe.gz
	)
	add_test(
	NAME t_ME_h
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtinf.yml ${tst_ME_data_dir}/ME_h_mtinf.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	if(${QCDloop_FOUND})
	add_test(
	NAME t_ME_h_mt
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mt.yml ${tst_ME_data_dir}/ME_h_mt.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	add_test(
	NAME t_ME_h_mtmb
	COMMAND test_ME_generic ${tst_ME_data_dir}/config_mtmb.yml ${tst_ME_data_dir}/ME_h_mtmb.dat ${tst_ME_data_dir}/PSP_h.lhe.gz
	)
	endif()
	add_test(
	NAME t_2j
	COMMAND check_res ${tst_dir}/2j.lhe.gz 3.49391e+07 419684
	)
	add_test(
	NAME t_3j
	COMMAND check_res ${tst_dir}/3j.lhe.gz 2.37902e+06 25746.6
	)
	add_test(
	NAME t_4j
	COMMAND check_res ${tst_dir}/4j.lhe.gz 603713 72822.6
	)
	add_test(
	NAME t_h_3j
	COMMAND check_res ${tst_dir}/h_3j.lhe.gz 0.821622 0.0220334
	)
	add_test(
	NAME t_h_3j_uno
	COMMAND check_res ${tst_dir}/h_3j_uno.lhe.gz 0.0261968 0.000341549 uno
	)
	if(${HepMC_FOUND})
	file(READ "${tst_dir}/jet_config.yml" config)
	file(WRITE "${tst_dir}/jet_config_withHepMC.yml" "${config} - tst.hepmc")
	if(${rivet_FOUND})
	file(READ "${tst_dir}/jet_config_withHepMC.yml" config)
	file(WRITE "${tst_dir}/jet_config_withRivet.yml" "${config}\n\nanalysis:\n rivet: MC_XS\n output: tst")
	add_test(
	NAME t_main
	COMMAND HEJ ${tst_dir}/jet_config_withRivet.yml ${tst_dir}/2j.lhe.gz
	)
	else()
	add_test(
	NAME t_main
	COMMAND HEJ ${tst_dir}/jet_config_withHepMC.yml ${tst_dir}/2j.lhe.gz
	)
	endif()
	if(${HepMC_VERSION_MAJOR} GREATER 2)
	add_executable(check_hepmc ${tst_dir}/check_hepmc.cc)
	target_link_libraries(check_hepmc hejlib)
	add_test(
	NAME t_hepmc
	COMMAND check_hepmc tst.hepmc
	)
	endif()
	else()
	add_test(
	NAME t_main
	COMMAND HEJ ${tst_dir}/jet_config.yml ${tst_dir}/2j.lhe.gz
	)
	endif()
	add_test(
	NAME t_lhe
	COMMAND check_lhe tst.lhe
	)
	add_test(
	NAME t_scale_import
	COMMAND test_scale_import ${tst_dir}/jet_config_with_import.yml
	)
	add_test(
	NAME t_descriptions
	COMMAND test_descriptions
	)
	add_test(
	NAME t_scale_arithmetics
	COMMAND test_scale_arithmetics ${tst_dir}/jet_config.yml ${tst_dir}/2j.lhe.gz
	)
	diff --git a/Changes.md b/Changes.md
	index bddba91..40253c9 100644
	--- a/Changes.md
	+++ b/Changes.md
	@@ -1,28 +1,29 @@
	# Version 2.0

	## 2.X.0

	* Made `MatrixElement::tree_kin` and `MatrixElement::tree_param` public
	* Allow multiplication and division of multiple scale functions e.g.
	`H_T/2*m_j1j2`
	* Follow HepMC convention for particle Status codes: incoming = 11,
	decaying = 2, outgoing = 1 (unchanged)

	## 2.0.4

	-* Fix `HEJ_INCLUDE_DIR` in `hej-config.cmake`
	-* Correctly find the rivet header directory
	+* `HEJ_INCLUDE_DIR` in `hej-config.cmake` now gives the correct path
	+* Correctly include the rivet headers
	+* Consistent variable names for side package included in `CMakeList.txt`

	## 2.0.3

	* Fixed parsing of (numerical factor) * (base scale) in configuration
	* Don't change scale names, but sanitise Rivet output file names instead

	## 2.0.2

	* Changed scale names to `"_over_"` and `"_times_"` for proper file names (was
	`"/"` and `"*"` before)

	## 2.0.1

	* Fixed name of fixed-order generator in error message.
	diff --git a/FixedOrderGen/CMakeLists.txt b/FixedOrderGen/CMakeLists.txt
	index 9c4d729..75ddbc7 100644
	--- a/FixedOrderGen/CMakeLists.txt
	+++ b/FixedOrderGen/CMakeLists.txt
	@@ -1,121 +1,121 @@
	cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

	set(CMAKE_LEGACY_CYGWIN_WIN32 0)
	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

	project("HEJ Fixed Order Generation" VERSION 2.0.4 LANGUAGES C CXX)

	# Set a default build type if none was specified
	set(default_build_type "RelWithDebInfo")

	if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
	message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
	set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
	STRING "Choose the type of build." FORCE)
	# Set the possible values of build type for cmake-gui
	set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
	"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
	endif()

	## Flags for the compiler. No warning allowed.
	if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
	elseif (MSVC)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /EHsc")
	endif()
	set(CMAKE_CXX_STANDARD_REQUIRED ON)
	set(CMAKE_CXX_STANDARD 14)

	## Create Version
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")


	# Get the latest abbreviated commit hash of the working branch
	execute_process(
	COMMAND git rev-parse HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_REVISION
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)
	# Get the current working branch
	execute_process(
	COMMAND git rev-parse --abbrev-ref HEAD
	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
	OUTPUT_VARIABLE PROJECT_GIT_BRANCH
	OUTPUT_STRIP_TRAILING_WHITESPACE
	)

	CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/Version.hh.in
	${PROJECT_BINARY_DIR}/include/Version.hh @ONLY )

	## Add directories and find dependences
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include)
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cmake/Modules/")

	find_package(HEJ 2 REQUIRED)
	include_directories(${HEJ_INCLUDE_DIR})
	find_package(fastjet REQUIRED)
	-include_directories(${fastjet_INCLUDE_PATH})
	+include_directories(${fastjet_INCLUDE_DIRS})
	find_package(clhep 2.3 REQUIRED)
	-include_directories(${CLHEP_INCLUDE_PATH})
	+include_directories(${CLHEP_INCLUDE_DIRS})
	find_package(lhapdf REQUIRED)
	-include_directories(${lhapdf_INCLUDE_PATH})
	+include_directories(${lhapdf_INCLUDE_DIRS})
	## Amend unintuitive behaviour of FindBoost.cmake
	## Priority of BOOST_ROOT over BOOSTROOT matches FindBoost.cmake
	## at least for cmake 3.12
	if(DEFINED BOOST_ROOT)
	message("BOOST_ROOT set - only looking for Boost in ${BOOST_ROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	elseif(DEFINED BOOSTROOT)
	message("BOOSTROOT set - only looking for Boost in ${BOOSTROOT}")
	set(Boost_NO_BOOST_CMAKE ON)
	endif()
	find_package(Boost REQUIRED COMPONENTS iostreams)
	include_directories(${Boost_INCLUDE_DIRS})
	find_package(yaml-cpp)
	include_directories(${YAML_CPP_INCLUDE_DIR})
	find_package(QCDloop 2)
	if(${QCDloop_FOUND})
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHEJ_BUILD_WITH_QCDLOOP")
	include_directories(SYSTEM ${QCDloop_INCLUDE_DIRS})
	endif()

	## define executable
	file(GLOB HEJFOG_source ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc)
	list(REMOVE_ITEM HEJFOG_source ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc)
	add_library(hejfog STATIC ${HEJFOG_source})
	add_executable(HEJFOG ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc)

	## link libraries
	set(libraries ${CMAKE_DL_LIBS} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES}
	${FASTJET_LIBRARIES} ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} ${HEJ_LIBRARIES})
	if(${QCDloop_FOUND})
	list(APPEND libraries ${QCDloop_LIBRARIES} quadmath)
	endif()

	target_link_libraries(hejfog ${libraries})
	target_link_libraries(HEJFOG hejfog)

	install(TARGETS HEJFOG DESTINATION bin)

	## tests

	enable_testing()
	set(tst_dir "${CMAKE_CURRENT_SOURCE_DIR}/t")
	foreach(tst h_2j h_3j h_5j h_3j_uno1 h_3j_uno2 h_2j_decay 2j 4j)
	add_executable(test_${tst} ${tst_dir}/${tst}.cc)
	target_link_libraries(test_${tst} hejfog)
	add_test(NAME t_${tst} COMMAND test_${tst} WORKING_DIRECTORY ${tst_dir})
	endforeach()
	add_test(
	NAME t_main_2j
	COMMAND HEJFOG ${tst_dir}/config_2j.yml
	)
	add_test(
	NAME t_main_h2j
	COMMAND HEJFOG ${tst_dir}/config_h_2j.yml
	)
	add_test(
	NAME t_main_h2j_decay
	COMMAND HEJFOG ${tst_dir}/config_h_2j_decay.yml
	)
	diff --git a/cmake/Modules/Findclhep.cmake b/cmake/Modules/Findclhep.cmake
	index 6e4943a..93c796c 100644
	--- a/cmake/Modules/Findclhep.cmake
	+++ b/cmake/Modules/Findclhep.cmake
	@@ -1,35 +1,35 @@
	include (FindPackageMessage)
	include(FindPackageHandleStandardArgs)

	message (STATUS "Detecting clhep installation")
	execute_process (COMMAND clhep-config --prefix
	OUTPUT_VARIABLE clhep_PREFIX
	)
	if (clhep_PREFIX)
	string (REGEX REPLACE "\"$.$\"[ \t\r\n]$" "\\1" clhep_PREFIX ${clhep_PREFIX} )
	message (STATUS "clhep installation found: ${clhep_PREFIX}")
	EXECUTE_PROCESS(COMMAND clhep-config --libs OUTPUT_VARIABLE
	CLHEP_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
	EXECUTE_PROCESS(COMMAND clhep-config --version OUTPUT_VARIABLE
	clhep_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
	string(REGEX REPLACE "CLHEP " "" clhep_VERSION ${clhep_VERSION})
	- set (CLHEP_INCLUDE_PATH ${clhep_PREFIX}/include)
	+ set (CLHEP_INCLUDE_DIRS ${clhep_PREFIX}/include)
	set (clhep_FOUND TRUE)
	else (clhep_PREFIX)
	set (clhep_FOUND FALSE)
	endif (clhep_PREFIX)

	find_package_handle_standard_args(clhep
	FOUND_VAR
	clhep_FOUND
	REQUIRED_VARS
	- CLHEP_INCLUDE_PATH
	+ CLHEP_INCLUDE_DIRS
	CLHEP_LIBRARIES
	VERSION_VAR
	clhep_VERSION
	)

	mark_as_advanced(
	- CLHEP_INCLUDE_PATH
	+ CLHEP_INCLUDE_DIRS
	CLHEP_LIBRARIES
	)
	diff --git a/cmake/Modules/Findfastjet.cmake b/cmake/Modules/Findfastjet.cmake
	index a7d9073..cac2faf 100644
	--- a/cmake/Modules/Findfastjet.cmake
	+++ b/cmake/Modules/Findfastjet.cmake
	@@ -1,30 +1,26 @@
	include (FindPackageMessage)

	message (STATUS "Detecting FastJet installation")
	execute_process (COMMAND fastjet-config --prefix
	OUTPUT_VARIABLE fastjet_PREFIX
	)
	if (fastjet_PREFIX)
	string (STRIP ${fastjet_PREFIX} fastjet_PREFIX)
	message (STATUS "FastJet installation found: ${fastjet_PREFIX}")
	EXECUTE_PROCESS(COMMAND fastjet-config --libs OUTPUT_VARIABLE
	FASTJET_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
	# set (fastjet_LIBRARIES ${fastjet_LIBRARIES} )
	- set (fastjet_INCLUDE_PATH ${fastjet_PREFIX}/include)
	+ set (fastjet_INCLUDE_DIRS ${fastjet_PREFIX}/include)
	set (fastjet_FOUND TRUE)
	else (fastjet_PREFIX)
	set (fastjet_FOUND FALSE)
	endif (fastjet_PREFIX)

	if (NOT fastjet_FOUND)
	message(FATAL_ERROR "FastJet installation not found!")
	endif (NOT fastjet_FOUND)

	mark_as_advanced(
	- fastjet_INCLUDE_PATH
	+ fastjet_INCLUDE_DIRS
	fastjet_LIBRARIES
	)
	-
	-
	-
	-
	diff --git a/cmake/Modules/Findlhapdf.cmake b/cmake/Modules/Findlhapdf.cmake
	index c8eb556..90eb8ad 100644
	--- a/cmake/Modules/Findlhapdf.cmake
	+++ b/cmake/Modules/Findlhapdf.cmake
	@@ -1,28 +1,26 @@
	include (FindPackageMessage)

	message (STATUS "Detecting lhapdf installation")
	execute_process (COMMAND lhapdf-config --prefix
	OUTPUT_VARIABLE lhapdf_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE
	)
	if (lhapdf_PREFIX)
	string (STRIP ${lhapdf_PREFIX} lhapdf_PREFIX)
	message (STATUS "lhapdf installation found: ${lhapdf_PREFIX}")
	EXECUTE_PROCESS(COMMAND lhapdf-config --ldflags OUTPUT_VARIABLE
	LHAPDF_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
	# set (lhapdf_LIBRARIES ${lhapdf_LIBRARIES} )
	- set (lhapdf_INCLUDE_PATH ${lhapdf_PREFIX}/include)
	+ set (lhapdf_INCLUDE_DIRS ${lhapdf_PREFIX}/include)
	set (lhapdf_FOUND TRUE)
	else (lhapdf_PREFIX)
	set (lhapdf_FOUND FALSE)
	endif (lhapdf_PREFIX)

	if (NOT lhapdf_FOUND)
	message(FATAL_ERROR "lhapdf installation not found!")
	endif (NOT lhapdf_FOUND)

	mark_as_advanced(
	- lhapdf_INCLUDE_PATH
	+ lhapdf_INCLUDE_DIRS
	lhapdf_LIBRARIES
	)
	-
	-

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jan 20, 10:58 PM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4242752
Default Alt Text: (17 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions