Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F8724262
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Subscribers
None
View Options
diff --git a/Changes.md b/Changes.md
index 40253c9..7d4f5eb 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,29 +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
* `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`
+* Consistent search and include for side packages in `cmake`
## 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/src/CMakeLists.txt b/src/CMakeLists.txt
index fd53f37..0b3005c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,28 +1,19 @@
file(GLOB src_files *.cc)
add_library(hejlib SHARED ${src_files})
set_target_properties(hejlib PROPERTIES OUTPUT_NAME "HEJ")
-message(STATUS "LHAPDF_LIBRARIES ${LHAPDF_LIBRARIES}")
-message(STATUS "CLHEP_LIBRARIES ${CLHEP_LIBRARIES}")
-message(STATUS "fastjet_LIBRARIES ${fastjet_LIBRARIES}")
-message(STATUS "Boost_LIBRARIES ${Boost_LIBRARIES}")
-message(STATUS "YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARIES}")
-message(STATUS "QCDloop_LIBRARIES ${QCDloop_LIBRARIES}")
-message(STATUS "HepMC_LIBRARIES ${HepMC_LIBRARIES}")
-message(STATUS "rivet_LIBRARIES ${rivet_LIBRARIES}")
-
set(libraries ${CMAKE_DL_LIBS} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES}
${fastjet_LIBRARIES} ${Boost_LIBRARIES} ${YAML_CPP_LIBRARIES} yaml-cpp)
if(${QCDloop_FOUND})
list(APPEND libraries ${QCDloop_LIBRARIES} quadmath)
endif()
if(${HepMC_FOUND})
list(APPEND libraries ${HepMC_LIBRARIES})
if(${rivet_FOUND})
list(APPEND libraries ${rivet_LIBRARIES})
endif()
endif()
target_link_libraries(hejlib ${libraries})
install(TARGETS hejlib DESTINATION ${INSTALL_LIB_DIR})
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Jan 20, 10:58 PM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4207126
Default Alt Text
(2 KB)
Attached To
rHEJ HEJ
Event Timeline
Log In to Comment