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.

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

[irods/irods#7265] Minor reorganization + CMake TLC #155

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

SwooshyCueb
Copy link
Member

@SwooshyCueb SwooshyCueb commented Mar 12, 2024

In service of irods/irods#7265

This does not break compatibility with 4.3.1.

I didn't notice that there was still an open PR (#141) until just now, so I'd prefer to wait until that is merged and then rebase.

@SwooshyCueb SwooshyCueb changed the title [irods/irods#7625] Minor reorganization + CMake TLC [irods/irods#7265] Minor reorganization + CMake TLC Mar 12, 2024
@SwooshyCueb SwooshyCueb force-pushed the cmake-tlc.main branch 2 times, most recently from e174396 to 81b5e16 Compare March 13, 2024 02:33
@korydraughn
Copy link
Contributor

Ignore that PR. I have to do more investigation before that can be merged.

If this work is ready for review, let's go ahead and take it out of draft.

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

Done

@SwooshyCueb
Copy link
Member Author

Once this PR is merged, please create a 4-3-stable branch

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.

Feel free to ignore the suggested name change. I think everything looks fine as-is.

common/CMakeLists.txt Show resolved Hide resolved
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.

Looks good.

Pound it.

- Project tree structure reorganized to resemble that of main irods repo.
- Added quotes around paths in CMake files.
- Removed CMAKE_SHARED_LINKER_FLAGS_INIT and
  CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT, as no shared libraries are built.
- Removed unused postinst script for nonexistent data_world package
- Removed rpm package dependency declaration on openssl
- Fixed postinst CPack variables
@SwooshyCueb
Copy link
Member Author

#'d

@alanking alanking merged commit 8ac1fa1 into irods:main Mar 14, 2024
2 checks passed
@alanking
Copy link
Contributor

4-3-stable branch created based on 8ac1fa1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants