On Thu, Aug 21, 2014 at 02:47:24PM +0200, Rolf Eike Beer wrote: > Roger Leigh wrote: > > On Sun, Aug 17, 2014 at 05:22:38PM +0100, Roger Leigh wrote: > > > On Sun, Aug 17, 2014 at 05:50:58PM +0200, Rolf Eike Beer wrote: > > > > Am Sonntag, 17. August 2014, 16:21:24 schrieb Roger Leigh: > > > > > On Fri, Aug 15, 2014 at 12:31:17AM +0100, Roger Leigh wrote: > > > > > > OK. I'll have to read up on this and see what needs doing. > > > > > > In the meantime, I've attached a revised patch with all the > > > > > > above corrections included. > > > > > > > > > > Based on the comments made on my other FindXerces patch, I've > > > > > updated this patch to also use current naming and usage > > > > > conventions. I hope this is all OK with you. > > > > > > > > + if((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION GREATER 1400 AND > > > > MSVC_VERSION LESS 1500)) if((NOT MSVC_VERSION VERSION_LESS 1400 AND > > > > MSVC_VERSION LESS 1500)> > > > Thanks, I've fixed this now in the attached patch. > > > > One single line change to the patch attached, to add support for > > FreeBSD, which uses a different slice directory (unversioned > > share/Ice). > > Pushed, including some cleanups: > -remove text in else(), endif() and so on (applies also to FindXerces) > -if (...) else() can be if (NOT ...) > -used elseif for MSVC version scanning, once you have found one version the > other if's can't be true > > Please check if I have messed something up.
I've looked through the changes for both files and I can't see any problems there. I tested FindXerces on Linux and MacOS and can't see any changes in behaviour. Likewise I tested FindIce on Linux, MacOS and Windows in a variety of different combinations of compiler and Ice versions and also didn't see any problems. I've pushed the cleanups into our local git repositories and they will be picked up by our automated jenkins CI testing; I'll have the results of that by Monday, but I wouldn't expect it to be any different from the manual testing I've already done. Many thanks, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' schroot and sbuild http://alioth.debian.org/projects/buildd-tools `- GPG Public Key F33D 281D 470A B443 6756 147C 07B3 C8BC 4083 E800 -- 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
