On 08/06/2014 11:11 AM, Konstantin Podsvirov wrote: > Update from August 6, available for testing and use.
Thanks. I squashed the new changes down to three commits: Doxygen: Add CPack/IFW subdir to doxyfile.in INPUT section http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3040ab8f Doxygen: Add STRIP_FROM_PATH variable to doxyfile.in http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82382479 CPackIFW: Refactor and revise this generator http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194b412b You can compare it to your last commit (381bbad5) with: git diff 381bbad5 194b412b -w --color-words=. to see that there are almost no non-whitespace changes. I did need to make a few changes for portable compilation. Otherwise all the changes are CRLF->LF newline conversion, line length, and indentation style. FYI, if you were to start a new branch and base your changes off the upstream version instead of merging it then I would not have to keep squashing away your history as much. I may still rewrite things a bit but then you can just rebase further changes on the revised upstream version. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
