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

Update CMakeLists.txt (#118) #119

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Conversation

thomasCresson
Copy link
Contributor

Updating the CMakeLists.txt in order to download googletest only when CHOICE_BUILD_TESTS or CHOICE_BUILD_EXAMPLES are set to ON.

Updating the CMakeLists.txt in order to download googletest only when
CHOICE_BUILD_TESTS or CHOICE_BUILD_EXAMPLES are set to ON.
@KjellKod
Copy link
Owner

KjellKod commented Jan 4, 2022

Unfortunately Travis-CI is not longer free of use so until I've replaced it with Circle-CI I have to make sure to test it manually on OSX and Linux ... I should have time to do that today or tomorrow.

Copy link
Owner

@KjellKod KjellKod left a comment

Choose a reason for hiding this comment

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

Confirmed to work great on OSX. I see no reason why this cmake change wouldn't work also on Ubuntu so it should be fine to merge

@@ -29,8 +29,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
message("Install rpath location: ${CMAKE_INSTALL_RPATH}")
endif()

# Download and add gtest so the sinks can use it for testing
include(gtest.cmake)
if(CHOICE_BUILD_TESTS OR CHOICE_BUILD_EXAMPLES)
Copy link
Owner

Choose a reason for hiding this comment

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

Nice improvement

@KjellKod KjellKod merged commit 03e3a3a into KjellKod:master Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants