8000 Revamped CMakeLists.txt by GamePad64 · Pull Request #36 · docopt/docopt.cpp · GitHub
[go: up one dir, main page]

Skip to content

Revamped CMakeLists.txt #36

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

Merged
merged 1 commit into from
May 15, 2016
Merged

Revamped CMakeLists.txt #36

merged 1 commit into from
May 15, 2016

Conversation

GamePad64
Copy link
Contributor
  • Now version of the package is defined in project() directive on line 2. CPack derives its package version from there now.
  • Removed WITH_STATIC option. Now static lib is being linked every time, but compilation of source files is performed only once using CMake OBJECT library
  • Defined docopt_SOURCES and docopt_HEADERS more explicitly and once.
  • Now docopt supports installing as "CMake native package", enabling its install system-wide.

Now version of the package is defined in project() directive on line 2.
Removed WITH_STATIC option. Now static lib is being linked every time, but compilation of source files is performed only once (google for CMake OBJECT targets)
Defined docopt_SOURCES and docopt_HEADERS more explicitly.
Now docopt supports installing as "CMake native package", enabling its install system-wide.
@chrisdembia
Copy link
Contributor

+1

@jaredgrubb
Copy link
Member

I'm no cmake expert, so I'll trust you both since Travis seems ok!

@jaredgrubb jaredgrubb merged commit cf1e25c into docopt:master May 15, 2016
@chrisdembia
Copy link
Contributor

It is preferable to use CMAKE_INSTALL_LIBDIR instead of lib so that when you install into system-wide directories on a UNIX machine, the libraries end up in the correct place (like lib64). You can override CMAKE_INSTALL_LIBDIR if you like (in the CMake GUI, on the command line -DCMAKE_INSTALL_LIBDIR=lib, etc.).

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.

6 participants
0