Bug Fix: Respect CMake output directory overrides#4963
Open
dragoiuc wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4957.
This PR updates GoogleTest's CMake output directory handling so that user-provided
CMAKE_<ARTIFACT>_OUTPUT_DIRECTORYvalues are respected.Before this change,
cxx_library_with_typeset the output directory propertiesdirectly on each target. Because of that, setting something like
CMAKE_ARCHIVE_OUTPUT_DIRECTORYwould not affect wherelibgtest.aorlibgtest_main.awere placed.The fix keeps GoogleTest's existing default layout when users do not set any
custom output directories, but avoids overriding the user's values when they do.
I also added a regression test for this behavior. The test checks that:
bin/andlib/locationsCMAKE_*_OUTPUT_DIRECTORYvalues are respectedTests run:
cmake -S . -B /tmp/gtest-pr-check -DBUILD_GMOCK=OFF -Dgtest_build_tests=ON -DINSTALL_GTEST=OFFcmake --build /tmp/gtest-pr-check -j2ctest --test-dir /tmp/gtest-pr-check -R googletest-cmake-output-directory-test --output-on-failurectest --test-dir /tmp/gtest-pr-check --output-on-failureCMAKE_ARCHIVE_OUTPUT_DIRECTORYforgtestandgtest_main