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

Fix cmake #30

Merged
merged 3 commits into from
Oct 22, 2012
Merged

Fix cmake #30

merged 3 commits into from
Oct 22, 2012

Conversation

drakeguan
Copy link

Those 3 commits about cmake was done by davvid/partio and I have double checked to make sure it works well under Linux and Mac OS X. I like to suggest merge his work. Furthermore, that can make sure mxcl/homebrew will be happy to see that.

Check whether CMAKE_INSTALL_PREFIX is defined before overwriting
its value.  This allows users to specify an alternate install prefix
during the `cmake` invocation.

Signed-off-by: David Aguilar <davvid@gmail.com>
Use ${DOXYGEN_EXECUTRABLE} instead of hard-coding /usr/bin/doxygen.

Signed-off-by: David Aguilar <davvid@gmail.com>
We were referring to a build directory that does not exist
when building out-of-tree.

For example:

	mkdir build
	cd build
	cmake ..
	make
	make DESTDIR=$PWD/DESTDIR install

The `install` step will fail because build/src/py/partio.py
does not exist.  Remove the src/ subdirectory in the path so
that the file beneath build/ is found.

Signed-off-by: David Aguilar <davvid@gmail.com>
@drakeguan
Copy link
Author

Wondering if this request got spotted or not~

@drakeguan
Copy link
Author

Anyone?

@aselle aselle merged commit e557c21 into wdas:master Oct 22, 2012
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.

3 participants