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

Cmake edit with 'make install' target #8

Merged
merged 3 commits into from
Feb 6, 2014
Merged

Conversation

dcoeurjo
Copy link
Contributor

@dcoeurjo dcoeurjo commented Feb 5, 2014

Minor pull request to enhance cmake build system:

  • benchmark_test and the library are built in the cmake current build folder (no more lib/ and bin/ in the source tree)
  • new install target "make install" to install the lib on the system

@dmah42
Copy link
Member

dmah42 commented Feb 5, 2014

before i can merge this: have you signed a Google CLA? https://developers.google.com/open-source/cla/individual

@dcoeurjo
Copy link
Contributor Author

dcoeurjo commented Feb 5, 2014

Done ;)

@dmah42
Copy link
Member

dmah42 commented Feb 5, 2014

should 'make install' not also copy the headers from include/ to /usr/local/include (on linux)?

@dcoeurjo
Copy link
Contributor Author

dcoeurjo commented Feb 5, 2014

of course.. let me fix this..

@dcoeurjo
Copy link
Contributor Author

dcoeurjo commented Feb 5, 2014

ok done, sorry.

COMPONENT library)
INSTALL(
DIRECTORY "${PROJECT_SOURCE_DIR}/include/benchmark"
DESTINATION include
Copy link
Member

Choose a reason for hiding this comment

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

how do you feel about installing from include/ to include/ so they'll end up in /usr/local/include/benchmark/... ?

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, everything ends up in include/benchmark/

%%%%> make install
[ 85%] Built target benchmark
[100%] Built target benchmark_test
Install the project...
 -- Install configuration: ""
 -- Installing: /usr/local/lib/libbenchmark.a
 -- Installing: /usr/local/include/benchmark
 -- Up-to-date: /usr/local/include/benchmark/benchmark.h
 -- Up-to-date: /usr/local/include/benchmark/macros.h

dmah42 pushed a commit that referenced this pull request Feb 6, 2014
Cmake edit with 'make install' target
@dmah42 dmah42 merged commit 0a1593b into google:master Feb 6, 2014
@dcoeurjo dcoeurjo deleted the cmakeFix branch February 6, 2014 19:16
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