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

Avoid using CMake 3.6 feature list(FILTER ...) #612

Merged
merged 1 commit into from
Jun 6, 2018

Conversation

Maratyszcza
Copy link
Contributor

@Maratyszcza Maratyszcza commented Jun 5, 2018

list(FILTER ...) is a CMake 3.6 feature, but benchmark targets CMake 2.8.12

@@ -11,7 +11,7 @@ file(GLOB
*.cc
${PROJECT_SOURCE_DIR}/include/benchmark/*.h
${CMAKE_CURRENT_SOURCE_DIR}/*.h)
list(FILTER SOURCE_FILES EXCLUDE REGEX "benchmark_main\\.cc")
list(REMOVE_ITEM SOURCE_FILES "benchmark_main.cc")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does that actually work though?
GLOB should result in absolute filenames..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, fix coming

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Switched to solution suggested by @kfitch in #603

list(FILTER ...) is a CMake 3.6 feature, but benchmark targets CMake 2.8.12
@AppVeyorBot
Copy link

@coveralls
Copy link

coveralls commented Jun 5, 2018

Coverage Status

Coverage remained the same at 87.157% when pulling 89f67d5 on Maratyszcza:fix-cmake-3.5-build into 1301f53 on google:master.

@AppVeyorBot
Copy link

@dmah42 dmah42 merged commit 505be96 into google:master Jun 6, 2018
@dmah42
Copy link
Member

dmah42 commented Jun 6, 2018

thanks for the quick fix.

JBakamovic pushed a commit to JBakamovic/benchmark that referenced this pull request Dec 6, 2018
list(FILTER ...) is a CMake 3.6 feature, but benchmark targets CMake 2.8.12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants