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

merged 48 commits into from
Dec 8, 2020

Conversation

spaulaus
Copy link
Owner

@spaulaus spaulaus commented Dec 8, 2020 •
edited
Loading

Description

  • Completely rewritten most of the CMake files to use more robust target specific commands. We no longer have globally defined includes or libraries. This makes it much clearer as to what program depends on what code/library.
  • Uses functionality that requires CMake 3.13+
  • Only build shared objects now. This reduces our exe size, and makes it easier to swap out components if needed.
  • Cleaned up compilation errors and ensure that all of the programs compile.
  • Dumped cmake flags that weren't needed, or didn't provide value.
  • Moved the flags in the files that they control. This gives a better coupling between the flag and what it toggles.
  • Relocated all testing related codes to the test folder.
  • Fixed FindPLX and FindXIA to take into account changes in those APIs.
  • Removed FindGSL as it is now bundled with CMake
  • Now always generate compile_commands.json, just makes it easier for those that need it. It's not like it's a lot of overhead.
  • Organized Acquisition utility codes to live in better spots.

Related Issue

#94

Motivation and Context

The CMake scripts were getting a little out of hand. They didn't conform to modern CMake best practices. I also found them hard to follow.

How Has This Been Tested?

Tested by

  • building the software with ALL flags enabled.
  • deploying to TravisCI and ensuring that the programs build
  • deploying to TravisCI and ensuring all tests still pass.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the Contributing document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@spaulaus
#94: Updating pugixml version to 1.11.1 and fixing its build.
4c3a0ca
@spaulaus
#94: Updated PaassResources library build
bb61afc
@spaulaus
#94: Fixing the builds so that they install the includes
9a3c99c 
Since we're only building SOs we need to make sure that all the headers get installed properly. We'll do this with the PUBLIC_HEADER property for the library.
@spaulaus
#94: Updating Core files so that they build properly
fdad5ff
@spaulaus
#94: Updating FindPLX.cmake to look for the stock lib names
51fb3e1 
The stock makefile generates PlxApi.a and PlxApi.so without lib on the front. I wanted to move this back to a more stock install, so we modified the variables to support the stock library names.
@spaulaus
#94: Updating FindXIA.cmake to take into account latest XIA updates
54189d1
@spaulaus
#94: Fixing CI build script due to changes in the APIs
be42799
@spaulaus
#94: Interface builds and installs as expected
1e415bc
@spaulaus
#94: Removing a confusing message from CMakeLists.txt
8880f45
@spaulaus
#94: MCA binary and library build and install
1a7e093
@spaulaus
#94: poll2 binary builds and installs
705641d
@spaulaus
#94: Moved listener to the Acquisition/Utilities folder
ef7a5c5
@spaulaus
#94: Moved monitor to the Acquisition/Utilities folder
40f21c9
@spaulaus
#94: Moved monitor.bash to keep it organized
b227b31
@spaulaus
#94: Updated so that we install monitor.bash
29450a0
@spaulaus
#94: Organizing send_alarm to be in Utilities
069c336
@spaulaus
#94: Updating set2root build and install
c082dc9
@spaulaus
#94: Moving set2root to live with the other Utilities
3df5c10
@spaulaus
#94: Building and installing individual setup programs
05d5cb3
@spaulaus
#94: Adding note about the DataGenerator
f1084e4
@spaulaus
#94: Moving PLX and XIA SDK finds to the Acquisition CMakeLists.txt
887f2bf
@spaulaus
#94: Adding missing library to poll2 build
5c2f0ac
@spaulaus
#94: Analysis/Resources builds and installs as expected.
56b3c6c
@spaulaus
#94: Adding Acquisition/Setup/Traces to install
f72089e
@spaulaus
#94: EventReader builds and installs
38cf0bb
@spaulaus
#94: HeadReader builds and installs
489da2c
@spaulaus
#94: HexReader builds and installs
ed9e9c5
@spaulaus
#94: Fixing CI build script
0bac096
@spaulaus
#94: RootScanner builds and installs
2367075
@spaulaus
#94: Adding GSL library to the linker for AnalysisResources
0dee74f
@spaulaus
#94: Scope builds and installs
865733f
@spaulaus
#94: Skeleton builds and installs
7a1769a
@spaulaus
#94: utkscan builds and installs
145c54e
@spaulaus
#94: Adding GSL Option to AnalysisResources to allow GSL 1.X or 2.X u…
025f111 
…sage.
@spaulaus
#94: Adding compilation flag to PixieInterface to ensure we get the L…
a92082c 
…inux version of Pixie SDK
@spaulaus
#94: Cleaning up the root directory's CMakeLists.txt
13ebfcb
@spaulaus
#94: Ensuring tests pass and CTerminalTest builds.
c905823 
We're not installing this binary as it's meant for test purposes.
@spaulaus
#94: Adding missing compiler flag to Setup utilities
4b37a3f
@spaulaus
#94: Updating CI build script
74da5cd
@spaulaus
#94: Removing build options as we don't need them in the CI now.
5c20234
@spaulaus
#94: Don't need to carry around our own FindGSL anymore.
a7ba7b3 
It was added to Cmake in version 3.2.
@spaulaus
#94: Fixing install prefix settings and adjusting install paths
e283d01 
I hated that the install directory would be created no matter what. We now use the default install prefix and append the project name to it. This should help make us more portable.

Added a library configuration file since we're building only SOs now. This will make it easier for users to update ld's search paths.

Adjsuted the install paths for files to match where you should find them on *nix systems. Not perfect but makes things clearer.
@spaulaus
#94: Taking the opportunity to update modulefile
aaab4cb
@spaulaus
#94: Removing all the jazz around generating compile_commands.json
50c9af9
@spaulaus
#94: Turning off tests by default.
f855e64
@spaulaus
#94: Fixing install name for modulefile
3bfbb8c
@spaulaus
#94: Now that we don't have the tests built by default we need to adj…
60c14ef 
…ust CI scripts to build them.
@spaulaus
#94: Fixing documentation in FindXIA.cmake
d29292a
@spaulaus spaulaus self-assigned this Dec 8, 2020
@spaulaus spaulaus added build Build platform updates/fixes/etc. enhancement New feature or request labels Dec 8, 2020
@spaulaus spaulaus merged commit dd811de into master Dec 8, 2020
@spaulaus spaulaus deleted the feature/94-updating-cmake branch December 8, 2020 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@spaulaus spaulaus

Labels
build Build platform updates/fixes/etc. enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@spaulaus