Skip to content

cmake: small fixes to install#10945

Merged
cmcfarlen merged 3 commits intoapache:masterfrom
cmcfarlen:cmake-more-install
Dec 20, 2023
Merged

cmake: small fixes to install#10945
cmcfarlen merged 3 commits intoapache:masterfrom
cmcfarlen:cmake-more-install

Conversation

@cmcfarlen
Copy link
Contributor

No description provided.

@cmcfarlen cmcfarlen added the CMake work related to CMakes scripts or issues label Dec 18, 2023
@cmcfarlen cmcfarlen added this to the 10.0.0 milestone Dec 18, 2023
@cmcfarlen cmcfarlen self-assigned this Dec 18, 2023
)

install(
TARGETS tsapi tsapibackend
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I should have removed this in the prior PR

if("$ENV{USER}" STREQUAL root)
foreach(DIR ${CHOWN_DIRS})
message(STATUS "Changing ${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
message(STATUS "Changing $ENV{DESTDIR}${DIR} ownership to ${OWNER_USER}:${OWNER_GROUP}")
Copy link
Contributor

Choose a reason for hiding this comment

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

It shouldn't have ${CMAKE_INSTALL_PREFIX} as well like the line below it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, the other should look like this one! I missed this picking from internal code. Thanks!

Copy link
Contributor

@JosiahWI JosiahWI left a comment

Choose a reason for hiding this comment

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

This also makes the CMakeUserPresets in .gitignore relative to the .gitignore location.

Looks good.

@SolidWallOfCode SolidWallOfCode self-requested a review December 18, 2023 23:13
@cmcfarlen cmcfarlen merged commit dce2dda into apache:master Dec 20, 2023
@cmcfarlen cmcfarlen deleted the cmake-more-install branch December 20, 2023 15:47
phongn pushed a commit to phongn/trafficserver that referenced this pull request Feb 1, 2024
* cmake: small fixes to install

* fix post install command

* Install yaml-cpp if the build uses the internal version

---------

Co-authored-by: Chris McFarlen <cmcfarlen@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CMake work related to CMakes scripts or issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants