Merge branch 'master' into colour_flow
964d4e082129
Actions

Description

Merge branch 'master' into colour_flow

Details

Provenance

hej	Authored on Apr 30 2019, 4:45 PM
hej	Pushed on Jan 14 2021, 6:07 PM

Parents

rHEJ944f51acb6f7: Show colour generation in program flow
rHEJa9dd73cc539f: Merge branch 'clean_cmake' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

hej committed rHEJ964d4e082129: Merge branch 'master' into colour_flow (authored by hej).Apr 30 2019, 4:45 PM

Merged Changes

a9dd73cc539f Merge branch 'clean_cmake' into 'master'
Author
amaier
Browse Repository
No Builds
No Audits
4a534e684cf3 Revert "Require YAML"
Author
hej
Browse Repository
No Builds
No Audits
ef4a70da6fda FOG doesn't need QCDloop
Author
hej
Browse Repository
No Builds
No Audits
0ee3adf9d7d1 Require YAML
Author
hej
Browse Repository
No Builds
No Audits
c26f8dc87af2 Added option to exclude optional packages
Author
hej
Browse Repository
No Builds
No Audits
151cb88a4d8e Clean changelog & remove debug output
Author
hej
Browse Repository
No Builds
No Audits
4d00c072d757 Use standard search in FindCLHEP.cmake Also always use all caps CLHEP
Author
hej
Browse Repository
No Builds
No Audits
3cba0bb81d4b Correctly find side package versions without "config" executable
Author
hej
Browse Repository
No Builds
No Audits
d5524362c7b2 Use standard search in Findfastjet.cmake
Author
hej
Browse Repository
No Builds
No Audits
b4e5f9436e99 spelling in CI: lhapdf->LHAPDF
Author
hej
Browse Repository
No Builds
No Audits
35208c667dfe Use standard search in FindLHAPDF.cmake
Author
hej
Browse Repository
No Builds
No Audits
5f02c382db63 Consistency in CMakeList.txt
Author
hej
Browse Repository
No Builds
No Audits
18843b565dd0 Correctly include the rivet headers
Author
hej
Browse Repository
No Builds
No Audits
8f0cbbe8b95c Fix: wrong name in hej-config.cmake
Author
hej
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

FixedOrderGen/

cmake/

Modules/

Templates/

doc/

sphinx/

conf.py

installation.rst

src/

CMakeLists.txt

rHEJ964d4e082129

View Options

.gitlab-ci.yml

View Options

CMakeLists.txt

View Options

Changes.md

View Options

FixedOrderGen/CMakeLists.txt

View Options

cmake/Modules/FindCLHEP.cmake

View Options

cmake/Modules/FindHepMC.cmake

View Options

cmake/Modules/FindLHAPDF.cmake

View Options

cmake/Modules/Findclhep.cmake

View Options

cmake/Modules/Findfastjet.cmake

View Options

cmake/Modules/Findlhapdf.cmake

View Options

cmake/Templates/hej-config.cmake.in

View Options

doc/sphinx/conf.py

View Options

doc/sphinx/installation.rst

View Options

Merge branch 'master' into colour_flow964d4e082129Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rHEJ964d4e082129

.gitlab-ci.yml

CMakeLists.txt

Changes.md

FixedOrderGen/CMakeLists.txt

cmake/Modules/FindCLHEP.cmake

cmake/Modules/FindHepMC.cmake

cmake/Modules/FindLHAPDF.cmake

cmake/Modules/Findclhep.cmake

cmake/Modules/Findfastjet.cmake

cmake/Modules/Findlhapdf.cmake

cmake/Templates/hej-config.cmake.in

doc/sphinx/conf.py

doc/sphinx/installation.rst

src/CMakeLists.txt

Merge branch 'master' into colour_flow
964d4e082129
Actions