Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ci fixes #1334

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Ci fixes #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88179e4
checkOverlaps, checkGeometry: move to DDCore since do not depend on G…
andresailer Oct 17, 2024
bba03cf
CI: key4hep: set CMAKE_INSTALL_LIBDIR, because Qt6 indiscriminately s…
andresailer Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ jobs:
unset CPATH
echo "::group::CMakeConfig"
cmake -GNinja \
-D CMAKE_INSTALL_LIBDIR=lib \
-DDD4HEP_USE_GEANT4=ON \
-DBoost_NO_BOOST_CMAKE=ON \
-DDD4HEP_USE_LCIO=ON \
Expand All @@ -149,6 +150,7 @@ jobs:
mkdir build
cd build
cmake -GNinja \
-D CMAKE_INSTALL_LIBDIR=lib \
-DBoost_NO_BOOST_CMAKE=ON \
-DDD4HEP_USE_XERCESC=ON \
-DCMAKE_CXX_STANDARD=20 ..
Expand Down
3 changes: 3 additions & 0 deletions DDCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ ENDIF()
file(GLOB DDCore_Python python/*.py)
install(FILES ${DDCore_Python} DESTINATION ${DD4HEP_PYTHON_INSTALL_DIR})

install(PROGRAMS python/bin/checkOverlaps.py DESTINATION bin RENAME checkOverlaps)
install(PROGRAMS python/bin/checkGeometry.py DESTINATION bin RENAME checkGeometry)

# install header files
install(DIRECTORY
include/DDSegmentation
Expand Down
0 DDG4/python/bin/checkGeometry.py → DDCore/python/bin/checkGeometry.py
View file
Open in desktop
File renamed without changes.
0 DDG4/python/bin/checkOverlaps.py → DDCore/python/bin/checkOverlaps.py
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions DDG4/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ get_filename_component(PYTHON_INTERPRETER_BINARY ${Python_EXECUTABLE} NAME)
configure_file(python/DDSim/bin/ddsim.in.py ${CMAKE_BINARY_DIR}/bin/ddsim @ONLY)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/ddsim DESTINATION bin)

install(PROGRAMS python/bin/checkOverlaps.py DESTINATION bin RENAME checkOverlaps)
install(PROGRAMS python/bin/checkGeometry.py DESTINATION bin RENAME checkGeometry)
install(PROGRAMS python/bin/g4MaterialScan.py DESTINATION bin RENAME g4MaterialScan)
install(PROGRAMS python/bin/g4GeometryScan.py DESTINATION bin RENAME g4GeometryScan)

Expand Down
Loading