From: Orion P. <or...@co...> - 2013-08-09 15:55:57
|
On 08/09/2013 09:24 AM, Alan W. Irwin wrote: > On 2013-08-08 10:01-0600 Orion Poplawski wrote: > >> Okay, next issue :) >> >> ------------------------------------------------------------------------ >> r12284 | airwin | 2013-01-07 22:26:34 -0700 (Mon, 07 Jan 2013) | 13 lines >> >> Insert \$ENV{DESTDIR} appropriately (with the "$" escaped because you >> want the environment variable DESTDIR to be read at install time >> rather than cmake time) for all install(CODE ... signatures usage. >> >> This change should let "make DESTDIR=<whatever> install" work >> correctly at install time whenever the doxygen documentation and the >> docbook documentation are being installed. >> >> Only the doxygen install change has been tested, but the >> corresponding change to the docbook install should also work >> since the same CMake rules should apply. >> ------------------------------------------------------------------------ >> >> This ends up adding an extra DESTDIR in the path since cmake automatically >> handles adding DESTDIR to the paths. This is with -DBUILD_DOC:BOOL=ON. I >> have not tested with PREBUILT_DOC. >> >> Reverting this commit fixes the install for me (unsurprising since 12281 was >> working fine for me before). > >> From the above commit message I explicitly tested that this worked > for the doxygen case. Is that case also fine for you, i.e., is > the docbook cases the only ones where DESTDIR is applied twice? > > I also notice (now) that the docbook case uses the file(INSTALL...) > signature inside the install(CODE...) command. Normally, > install(CODE...) needs explicit DESTDIR (which my above commit > supplied), but one interpretation of the documentation would imply the > case where file(INSTALL...) is used inside install(CODE...) is an > exception to that rule which would mean DESTDIR would be applied twice > but only for the docbook cases and not for the doxgyen case. > > Anyhow, I will test both the doxygen install and docbook install > cases and figure out what to do. Specifically, the plplotdoc.info files ended up with the duplicated DESTDIR. Not sure about anything else I'm afraid. -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane or...@nw... Boulder, CO 80301 http://www.nwra.com |