OpenCMT/uLib
1
0
Fork 0
mirror of https://github.com/OpenCMT/uLib.git synced 2025-12-06 07:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-inserted detector header files

Browse Source
This commit is contained in:
Paolo Andreetto
2019-06-05 11:56:19 +00:00
parent 51ef9d05f0
commit d6448ea42f
4 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/cmt-ulib.spec.in
View File

@@ -87,12 +87,14 @@ analysis and imaging software Developed by University of Padova and INFN Sezione
%dir /usr/include/mutom-0.2/Core %dir /usr/include/mutom-0.2/Core
%dir /usr/include/mutom-0.2/Math %dir /usr/include/mutom-0.2/Math
%dir /usr/include/mutom-0.2/Root %dir /usr/include/mutom-0.2/Root
%dir /usr/include/mutom-0.2/Detectors
%dir /usr/include/mutom-0.2/Vtk %dir /usr/include/mutom-0.2/Vtk
/usr/include/mutom-0.2/*.h /usr/include/mutom-0.2/*.h
/usr/include/mutom-0.2/Core/*.h /usr/include/mutom-0.2/Core/*.h
/usr/include/mutom-0.2/Math/*.h /usr/include/mutom-0.2/Math/*.h
/usr/include/mutom-0.2/Math/*.hpp /usr/include/mutom-0.2/Math/*.hpp
/usr/include/mutom-0.2/Root/*.h /usr/include/mutom-0.2/Root/*.h
/usr/include/mutom-0.2/Detectors/*.h
/usr/include/mutom-0.2/Vtk/*.h /usr/include/mutom-0.2/Vtk/*.h

6
CMake/uLibConfigHeader.cmake
View File

@@ -16,12 +16,6 @@ set(BOOST_PP_VARIADICS ON)
message(STATUS "PROJECT NAME = ${PROJECT_NAME}") message(STATUS "PROJECT NAME = ${PROJECT_NAME}")
message(STATUS "PACKAGE VERSION = ${PACKAGE_VERSION}") message(STATUS "PACKAGE VERSION = ${PACKAGE_VERSION}")
message(STATUS "PACKAGE NAME = ${PACKAGE_NAME}") message(STATUS "PACKAGE NAME = ${PACKAGE_NAME}")
execute_process(COMMAND "svnversion"
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE SVN_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE )
message(STATUS "SVN REVISION = ${SVN_REVISION}")
CHECK_INCLUDE_FILES(inittypes.h HAVE_INITTYPES_H) CHECK_INCLUDE_FILES(inittypes.h HAVE_INITTYPES_H)
CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H) CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)

3
CMakeLists.txt
View File

@@ -31,7 +31,7 @@ message(STATUS "Module path: ${CMAKE_MODULE_PATH}")
include(uLibMacros) include(uLibMacros)
include(uLibDebugMacro) include(uLibDebugMacro)
include(uLibTargetMacros) include(uLibTargetMacros)
include(uLibGenerateRMake) #include(uLibGenerateRMake)
## GLOBALS ------------------------------------------------------------------ ## ## GLOBALS ------------------------------------------------------------------ ##
@@ -57,6 +57,7 @@ set(ULIB_SELECTED_MODULES
Core Core
Math Math
Root Root
Detectors
) )
## uLib_add_shared_library puts names there ## uLib_add_shared_library puts names there

62
src/Detectors/CMakeLists.txt
View File

@@ -1,37 +1,37 @@
# HEADERS #set(HEADERS
set(HEADERS # DetectorChamber.h
DetectorChamber.h # ExperimentFitEvent.h
ExperimentFitEvent.h # GeantEvent.h
GeantEvent.h # HitMC.h
HitMC.h # MuonScatter.h
MuonScatter.h # MuonEvent.h
MuonEvent.h # MuonError.h
MuonError.h # ChamberHitEvent.h
ChamberHitEvent.h # Hit.h
Hit.h # LinearFit.h
LinearFit.h # Solid.h
Solid.h # Matter.h
Matter.h # Scene.h
Scene.h #)
)
# SOURCES #set(SOURCES
set(SOURCES # Solid.cpp
Solid.cpp # Scene.cpp
Scene.cpp #)
)
set(LIBRARIES #set(LIBRARIES
${Boost_SERIALIZATION_LIBRARY} # ${Boost_SERIALIZATION_LIBRARY}
${Boost_SIGNALS_LIBRARY} # ${Boost_SIGNALS_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} # ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Eigen_LIBRARY} # ${Eigen_LIBRARY}
${Geant4_LIBRARIES} # ${Geant4_LIBRARIES}
${ROOT_LIBRARIES} # ${ROOT_LIBRARIES}
${PACKAGE_LIBPREFIX}Core # ${PACKAGE_LIBPREFIX}Core
${PACKAGE_LIBPREFIX}Math # ${PACKAGE_LIBPREFIX}Math
) #)
set(HEADERS MuonScatter.h MuonError.h MuonEvent.h)
uLib_add_shared_library(${uLib-module}) uLib_add_shared_library(${uLib-module})
add_subdirectory(testing) add_subdirectory(testing)