Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
391659ef
Commit
391659ef
authored
1 year ago
by
Dmitry Kalinkin
Committed by
Andre Sailer
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
cmake: by default, enforce compression support for HepMC3 v3.2.5
parent
2e064e2e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+11
-3
11 additions, 3 deletions
CMakeLists.txt
DDTest/CMakeLists.txt
+19
-25
19 additions, 25 deletions
DDTest/CMakeLists.txt
with
30 additions
and
28 deletions
CMakeLists.txt
+
11
−
3
View file @
391659ef
...
@@ -160,9 +160,17 @@ if(DD4HEP_USE_HEPMC3)
...
@@ -160,9 +160,17 @@ if(DD4HEP_USE_HEPMC3)
# Optional dependencies for compressed input support
# Optional dependencies for compressed input support
if
(
${
HEPMC3_VERSION
}
VERSION_GREATER_EQUAL
"3.02.05"
)
if
(
${
HEPMC3_VERSION
}
VERSION_GREATER_EQUAL
"3.02.05"
)
find_package
(
ZLIB
)
option
(
DD4HEP_HEPMC3_COMPRESSION_SUPPORT
"Enable reading of compressed HepMC files"
ON
)
find_package
(
LibLZMA
)
if
(
${
DD4HEP_HEPMC3_COMPRESSION_SUPPORT
}
)
find_package
(
BZip2
)
find_package
(
ZLIB REQUIRED
)
find_package
(
LibLZMA REQUIRED
)
find_package
(
BZip2 REQUIRED
)
endif
()
else
()
option
(
DD4HEP_HEPMC3_COMPRESSION_SUPPORT
"Enable reading of compressed HepMC files"
OFF
)
if
(
${
DD4HEP_HEPMC3_COMPRESSION_SUPPORT
}
)
message
(
FATAL
"HepMC3 v3.2.5 is required for -DDD4HEP_HEPMC3_COMPRESSION_SUPPORT=ON"
)
endif
()
endif
()
endif
()
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
DDTest/CMakeLists.txt
+
19
−
25
View file @
391659ef
...
@@ -60,31 +60,25 @@ if (DD4HEP_USE_GEANT4)
...
@@ -60,31 +60,25 @@ if (DD4HEP_USE_GEANT4)
if
(
DD4HEP_USE_HEPMC3
)
if
(
DD4HEP_USE_HEPMC3
)
set
(
TEST_HEPMC3_EXTENSIONS
)
set
(
TEST_HEPMC3_EXTENSIONS
)
if
(
${
HEPMC3_VERSION
}
VERSION_GREATER_EQUAL
"3.02.05"
)
if
(
${
DD4HEP_HEPMC3_COMPRESSION_SUPPORT
}
)
if
(
ZLIB_FOUND
)
file
(
ARCHIVE_CREATE
file
(
ARCHIVE_CREATE
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.gz
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.gz
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
FORMAT raw
FORMAT raw
COMPRESSION GZip
)
COMPRESSION GZip
)
list
(
APPEND TEST_HEPMC3_EXTENSIONS .gz
)
list
(
APPEND TEST_HEPMC3_EXTENSIONS .gz
)
file
(
ARCHIVE_CREATE
endif
()
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.xz
if
(
LIBLZMA_FOUND
)
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
file
(
ARCHIVE_CREATE
FORMAT raw
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.xz
COMPRESSION XZ
)
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
list
(
APPEND TEST_HEPMC3_EXTENSIONS .xz
)
FORMAT raw
file
(
ARCHIVE_CREATE
COMPRESSION XZ
)
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.bz2
list
(
APPEND TEST_HEPMC3_EXTENSIONS .xz
)
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
endif
()
FORMAT raw
if
(
BZIP2_FOUND
)
COMPRESSION BZip2
)
file
(
ARCHIVE_CREATE
list
(
APPEND TEST_HEPMC3_EXTENSIONS .bz2
)
OUTPUT
${
CMAKE_CURRENT_BINARY_DIR
}
/Pythia_output.hepmc.bz2
PATHS
${
CMAKE_CURRENT_SOURCE_DIR
}
/inputFiles/Pythia_output.hepmc
FORMAT raw
COMPRESSION BZip2
)
list
(
APPEND TEST_HEPMC3_EXTENSIONS .bz2
)
endif
()
endif
()
endif
()
foreach
(
TEST_HEPMC3_EXTENSION
""
${
TEST_HEPMC3_EXTENSIONS
}
)
foreach
(
TEST_HEPMC3_EXTENSION
""
${
TEST_HEPMC3_EXTENSIONS
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment