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

Updating CMake #96

Merged
merged 48 commits into from
Dec 8, 2020
Merged

Updating CMake #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4c3a0ca
#94: Updating pugixml version to 1.11.1 and fixing its build.
spaulaus Dec 5, 2020
bb61afc
#94: Updated PaassResources library build
spaulaus Dec 5, 2020
9a3c99c
#94: Fixing the builds so that they install the includes
spaulaus Dec 5, 2020
fdad5ff
#94: Updating Core files so that they build properly
spaulaus Dec 5, 2020
51fb3e1
#94: Updating FindPLX.cmake to look for the stock lib names
spaulaus Dec 5, 2020
54189d1
#94: Updating FindXIA.cmake to take into account latest XIA updates
spaulaus Dec 5, 2020
be42799
#94: Fixing CI build script due to changes in the APIs
spaulaus Dec 5, 2020
1e415bc
#94: Interface builds and installs as expected
spaulaus Dec 5, 2020
8880f45
#94: Removing a confusing message from CMakeLists.txt
spaulaus Dec 5, 2020
1a7e093
#94: MCA binary and library build and install
spaulaus Dec 5, 2020
705641d
#94: poll2 binary builds and installs
spaulaus Dec 5, 2020
ef7a5c5
#94: Moved listener to the Acquisition/Utilities folder
spaulaus Dec 5, 2020
40f21c9
#94: Moved monitor to the Acquisition/Utilities folder
spaulaus Dec 5, 2020
b227b31
#94: Moved monitor.bash to keep it organized
spaulaus Dec 5, 2020
29450a0
#94: Updated so that we install monitor.bash
spaulaus Dec 5, 2020
069c336
#94: Organizing send_alarm to be in Utilities
spaulaus Dec 5, 2020
c082dc9
#94: Updating set2root build and install
spaulaus Dec 5, 2020
3df5c10
#94: Moving set2root to live with the other Utilities
spaulaus Dec 5, 2020
05d5cb3
#94: Building and installing individual setup programs
spaulaus Dec 5, 2020
f1084e4
#94: Adding note about the DataGenerator
spaulaus Dec 5, 2020
887f2bf
#94: Moving PLX and XIA SDK finds to the Acquisition CMakeLists.txt
spaulaus Dec 5, 2020
5c2f0ac
#94: Adding missing library to poll2 build
spaulaus Dec 5, 2020
56b3c6c
#94: Analysis/Resources builds and installs as expected.
spaulaus Dec 5, 2020
f72089e
#94: Adding Acquisition/Setup/Traces to install
spaulaus Dec 5, 2020
38cf0bb
#94: EventReader builds and installs
spaulaus Dec 5, 2020
489da2c
#94: HeadReader builds and installs
spaulaus Dec 6, 2020
ed9e9c5
#94: HexReader builds and installs
spaulaus Dec 6, 2020
0bac096
#94: Fixing CI build script
spaulaus Dec 6, 2020
2367075
#94: RootScanner builds and installs
spaulaus Dec 6, 2020
0dee74f
#94: Adding GSL library to the linker for AnalysisResources
spaulaus Dec 6, 2020
865733f
#94: Scope builds and installs
spaulaus Dec 6, 2020
7a1769a
#94: Skeleton builds and installs
spaulaus Dec 6, 2020
145c54e
#94: utkscan builds and installs
spaulaus Dec 6, 2020
025f111
#94: Adding GSL Option to AnalysisResources to allow GSL 1.X or 2.X u…
spaulaus Dec 6, 2020
a92082c
#94: Adding compilation flag to PixieInterface to ensure we get the L…
spaulaus Dec 6, 2020
13ebfcb
#94: Cleaning up the root directory's CMakeLists.txt
spaulaus Dec 6, 2020
c905823
#94: Ensuring tests pass and CTerminalTest builds.
spaulaus Dec 6, 2020
4b37a3f
#94: Adding missing compiler flag to Setup utilities
spaulaus Dec 6, 2020
74da5cd
#94: Updating CI build script
spaulaus Dec 6, 2020
5c20234
#94: Removing build options as we don't need them in the CI now.
spaulaus Dec 6, 2020
a7ba7b3
#94: Don't need to carry around our own FindGSL anymore.
spaulaus Dec 7, 2020
e283d01
#94: Fixing install prefix settings and adjusting install paths
spaulaus Dec 7, 2020
aaab4cb
#94: Taking the opportunity to update modulefile
spaulaus Dec 7, 2020
50c9af9
#94: Removing all the jazz around generating compile_commands.json
spaulaus Dec 7, 2020
f855e64
#94: Turning off tests by default.
spaulaus Dec 7, 2020
3bfbb8c
#94: Fixing install name for modulefile
spaulaus Dec 7, 2020
60c14ef
#94: Now that we don't have the tests built by default we need to adj…
spaulaus Dec 7, 2020
d29292a
#94: Fixing documentation in FindXIA.cmake
spaulaus Dec 8, 2020
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
Prev Previous commit
Next Next commit
#94: EventReader builds and installs
  • Loading branch information
@spaulaus
spaulaus committed Dec 5, 2020
commit 38cf0bb52fa064db1851765dafb6425ee673b734
4 changes: 2 additions & 2 deletions Analysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_subdirectory(Resources)
add_subdirectory(ScanLibraries)
#add_subdirectory(Resources)
#add_subdirectory(Utilities)
add_subdirectory(Utilities)

#option(PAASS_USE_HRIBF "Use HRIBF library for scan base." OFF)
#if (PAASS_USE_HRIBF)
Expand Down
38 changes: 19 additions & 19 deletions Analysis/Utilities/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ if(PAASS_BUILD_EVENT_READER)
add_subdirectory(EventReader)
endif(PAASS_BUILD_EVENT_READER)

if(PAASS_BUILD_HEAD_READER)
add_subdirectory(HeadReader)
endif(PAASS_BUILD_HEAD_READER)

if(PAASS_BUILD_HEX_READER)
add_subdirectory(HexReader)
endif(PAASS_BUILD_HEX_READER)

if(PAASS_BUILD_SKELETON)
add_subdirectory(Skeleton)
endif(PAASS_BUILD_SKELETON)

if(PAASS_BUILD_ROOT_SCANNER)
add_subdirectory(RootScanner)
endif(PAASS_BUILD_ROOT_SCANNER)

if(PAASS_BUILD_SCOPE)
add_subdirectory(Scope)
endif(PAASS_BUILD_SCOPE)
#if(PAASS_BUILD_HEAD_READER)
# add_subdirectory(HeadReader)
#endif(PAASS_BUILD_HEAD_READER)
#
#if(PAASS_BUILD_HEX_READER)
# add_subdirectory(HexReader)
#endif(PAASS_BUILD_HEX_READER)
#
#if(PAASS_BUILD_SKELETON)
# add_subdirectory(Skeleton)
#endif(PAASS_BUILD_SKELETON)
#
#if(PAASS_BUILD_ROOT_SCANNER)
# add_subdirectory(RootScanner)
#endif(PAASS_BUILD_ROOT_SCANNER)
#
#if(PAASS_BUILD_SCOPE)
# add_subdirectory(Scope)
#endif(PAASS_BUILD_SCOPE)
13 changes: 10 additions & 3 deletions Analysis/Utilities/EventReader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# @author S. V. Paulauskas
add_executable(eventReader source/eventReader.cpp source/EventReaderInterface.cpp source/EventReaderUnpacker.cpp)

include_directories(include)
add_subdirectory(source)
if (PAASS_USE_HRIBF)
target_sources(eventReader $<TARGET_OBJECTS:ScanorObjects>)
target_link_libraries(eventReader ${HRIBF_LIBRARIES})
endif (PAASS_USE_HRIBF)

target_link_libraries(eventReader PaassScan ${ROOT_LIBRARIES})
target_include_directories(eventReader PUBLIC include ${PROJECT_SOURCE_DIR}/Analysis/ScanLibraries/include
${ROOT_INCLUDE_DIR})
install(TARGETS eventReader DESTINATION bin)
12 changes: 0 additions & 12 deletions Analysis/Utilities/EventReader/source/CMakeLists.txt
View file
Open in desktop

This file was deleted.