Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NPDet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
NPDet
Merge requests
!2
Build configuration cleanup
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Build configuration cleanup
build_cleanup
into
master
Overview
3
Commits
3
Pipelines
0
Changes
10
Merged
David Blyth
requested to merge
build_cleanup
into
master
7 years ago
Overview
3
Commits
3
Pipelines
0
Changes
10
Expand
First pass:
Stripping unneeded comments and cmake code
Relocated config script generation to src/config/CMakeLists.txt
Second pass:
Further stripping of unneeded comments and cmake code in main CMakeLists.txt and subdirectories
Formatting of cmake code
Set GenericDetectors package version to NPDet version
Set default CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE
Edited
7 years ago
by
David Blyth
0
0
Merge request reports
Compare
master
version 2
6b0fab34
7 years ago
version 1
ee688dae
7 years ago
master (base)
and
latest version
latest version
e313252d
3 commits,
7 years ago
version 2
6b0fab34
2 commits,
7 years ago
version 1
ee688dae
1 commit,
7 years ago
10 files
+
172
−
426
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
10
Search (e.g. *.vue) (Ctrl+P)
src/ConceptDetectors/JLEIC/CMakeLists.txt
+
10
−
31
Options
cmake_minimum_required
(
VERSION 3.3 FATAL_ERROR
)
FIND_PACKAGE
(
DD4hep REQUIRED COMPONENTS DDRec DDG4
)
if
(
DD4hep_CMAKE_FILES_PATH
)
include
(
${
DD4hep_CMAKE_FILES_PATH
}
/DD4hep.cmake
)
else
()
include
(
${
DD4hep_DIR
}
/cmake/DD4hep.cmake
)
endif
()
#-----------------------------------------------------------------------------------
SET
(
a_lib_name JLEIC
)
set
(
a_lib_name JLEIC
)
dd4hep_configure_output
()
dd4hep_package
(
${
a_lib_name
}
MAJOR 0 MINOR 0 PATCH 1
USES [ROOT REQUIRED COMPONENTS Geom GenVector]
[DD4hep REQUIRED COMPONENTS DDCore DDRec]
OPTIONAL XERCESC
INCLUDE_DIRS include
)
USES [ROOT REQUIRED COMPONENTS Geom GenVector]
[DD4hep REQUIRED COMPONENTS DDCore DDRec]
INCLUDE_DIRS include
)
#-----------------------------------------------------------------------------------
dd4hep_add_plugin
(
${
a_lib_name
}
SOURCES src/*.cpp
)
#dd4hep_install_dir(compact DESTINATION ${DD4hep_DIR}/examples/ClientTests)
#-----------------------------------------------------------------------------------
install
(
DIRECTORY compact/ DESTINATION share/
${
PROJECT_NAME
}
/
${
a_lib_name
}
FILES_MATCHING PATTERN
"*.xml"
)
#dd4hep_configure_scripts(JLEIC DEFAULT_SETUP)
#set(exename recon_test)
#message("DD4hep_LIBRARIES : ${DD4hep_LIBRARIES}")
#add_executable(${exename} src/${exename}.cxx)
#target_link_libraries(${exename} ${DD4hep_LIBRARIES} ${DD4hep_DDREC_LIBRARY} )
#install(TARGETS ${exename}
# # IMPORTANT: Add the bar executable to the "export-set"
# EXPORT ${PROJECT_NAME}Targets
# RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin)
#-----------------------------------------------------------------------------------
install
(
DIRECTORY compact/
DESTINATION share/
${
PROJECT_NAME
}
/
${
a_lib_name
}
FILES_MATCHING PATTERN
"*.xml"
)
Loading