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

[#2080,#2154,irods/irods#7265] Minor reorganization + CMake TLC (4-3-stable) #2178

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[#2080,#2154,irods/irods#7265] Minor reorganization + CMake TLC (4-3-stable) #2178

merged 1 commit into from
Mar 6, 2024

Conversation

SwooshyCueb
Copy link
Member

In service of irods/irods#7265
Addresses #2080
Addresses #2154

@SwooshyCueb SwooshyCueb marked this pull request as ready for review March 6, 2024 14:54
@SwooshyCueb
Copy link
Member Author

Rebased and marked as ready for review

korydraughn
korydraughn approved these changes Mar 6, 2024
View reviewed changes
Copy link
Contributor

@korydraughn korydraughn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't spot anything unusual.

Let's get one more approval before pounding.

alanking
alanking approved these changes Mar 6, 2024
View reviewed changes
Copy link
Contributor

@alanking alanking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, looks identical to the other. # it.

@SwooshyCueb
[irods#2080,irods#2154,irods/irods#7265] Minor reorganization + CMake…
d0b987b 
… TLC

- Project tree structure reorganized to match that of main irods repo.
- Removed unused read_shared_memory.cpp.
- Fixed some system #includes not having angle brackets.
- Added quotes around paths in CMake files.
- Changed all instances of CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR.
- Removed CMAKE_SHARED_LINKER_FLAGS_INIT and
  CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT, as no shared libraries are built.
- Added IRODS_PLUGINS_DIRECTORY to
  CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION.
- Added CMAKE_EXE_LINKER_FLAGS_INIT and CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT
  for unit tests.
- [irods#2080] Rewrote unit test cmake to match that of main irods repo.
- [irods#2154] Replaced curl-devel package dependency declaration with libcurl
@SwooshyCueb
Copy link
Member Author

#'d

@alanking alanking merged commit d9c7420 into irods:4-3-stable Mar 6, 2024
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alanking alanking alanking approved these changes

@korydraughn korydraughn korydraughn approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SwooshyCueb @korydraughn @alanking