From: Doug M. <mc...@ia...> - 2012-07-30 15:18:24
|
On Jul 27, 2012, at 8:49 PM, Doug McCorkle wrote: > > On Jul 27, 2012, at 5:31 PM, Patrick Hartling wrote: > >> On Jul 27, 2012, at 2:52 PM, Doug McCorkle <mc...@ia...> wrote: >> >>> On Jul 6, 2012, at 3:50 PM, Doug McCorkle wrote: >>> >>>> >>>> On Jul 6, 2012, at 3:35 PM, Patrick Hartling wrote: >>>> >>>>> cppdom-config is a legacy script that wraps flagpoll usage. I don't know how important it is at this point, but installing it would maintain consistency with the SCons build. >>>> >>>> OK, I can get it in. >>>> >>>>> >>>>> What qualifies as CMake cruft? >>>> All of the find scripts and compiler check files that are not needed/used for the cppdom build. >>>> >>>>> I just grabbed everything from the Git repository. I don't think that I committed anything extra by mistake, but I don't have a good eye for what is critical for CMake to do its job. >>>> You did grab everything correctly. I checked with Ryan and he is alright with getting that directory cleaned up. I will go through and create a patch for it. >>> >>> Here is the first patch to cleanup the CMake scripts. I will work on adding a couple other things to the CMake build to make version tracking a bit easier and to ease using cppdom in third party projects. >>> >>> www.vrac.iastate.edu/~mccdo/CMakeCleanup.patch >> >> >> I applied your patch to the trunk and to the 1.2 branch. Thanks for taking the time to prepare that. > > This patch: > 1. Adds the cppdom-config back to the install target > 2. Corrects the usage of lib and lib64 install directories based on the build type > 3. Builds a version.h file based on the version info in the CMake scripts (this officially breaks the SCons build) > 4. Only installs the SpiritParser.h file if it is compiled into the library Here is a patch to follow on to rev 703. This patch: 1. Removes hard tabs from the CMake files 2. Adds helper files to the CMake build to make it easier to find in other CMake projects 3. Adds versioned library files back to the build 4. Places the flagpoll file in the lib directory rather than the share directory From my testing that puts the build back to where SCons was. In my opinion the SCons files could be deleted at this point. Doug |