summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCTestSVN: Extend Revision struct with SVN repo informationXavier Besseron2012-09-042-5/+13
| | | | Also rename DoRevision to DoRevisionSVN since the signature changes.
* cmCTestSVN: Add the new SVNInfo structureXavier Besseron2012-09-032-0/+51
| | | | | It represents information of an SVN repository. It can be the base repository or an external one.
* CMake Nightly Date StampKitware Robot2012-08-241-1/+1
|
* Merge topic 'Qt4Macros-fix-resource-parsing'Brad King2012-08-231-3/+5
|\ | | | | | | | | 3553001 Qt4Macros: Fix recently broken resource file parsing
| * Qt4Macros: Fix recently broken resource file parsingBrad King2012-08-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | Commit 4be67837 (read less from version headers into variables, 2012-08-19) switched from file(READ) and string(REGEX MATCHALL) to just file(STRINGS) to extract the list of resource <file> entries. However, the latter extracts entire lines that match the regex, not just the part that matches the regex, so the subsequent string(REGEX REPLACE) fails to match and replace anything. Return to the original parsing logic but replace file(READ) with file(STRINGS) to load a minimal part of the file before using string(REGEX MATCHALL) as before.
* | CMake Nightly Date StampKitware Robot2012-08-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2012-08-221-1/+1
| |
* | CMake Nightly Date StampKitware Robot2012-08-211-1/+1
| |
* | Merge topic 'qt4_use_modules'David Cole2012-08-202-0/+32
|\ \ | | | | | | | | | | | | 1420691 Add new qt4_use_modules function.
| * | Add new qt4_use_modules function.Stephen Kelly2012-08-192-0/+32
| | |
* | | Merge topic 'read-less-from-version-headers'David Cole2012-08-209-30/+35
|\ \ \ | | |/ | |/| | | | | | | 4be6783 read less from version headers into variables
| * | read less from version headers into variablesRolf Eike Beer2012-08-199-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of reading the whole file using file(READ) and later matching on the whole file use file(STRINGS ... REGEX) to get only those lines we are interested in at all. This will make the list much smaller (good for debugging) and also the regular expressions will need to match on much smaller strings. Also unset the content variables once they are not used anymore.
* | | Merge topic 'no-regex-escape-space'David Cole2012-08-203-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 637207e do not escape spaces in regular expressions
| * | | do not escape spaces in regular expressionsRolf Eike Beer2012-08-193-3/+3
| |/ / | | | | | | | | | | | | The space has no special meaning in regular expressions so it doesn't need to be escaped.
* | | Merge topic 'FindGTK2_12306'David Cole2012-08-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | ad30210 FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.h
| * | | FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.hPhilip Lowman2012-08-181-0/+1
| | | |
* | | | Merge topic 'FindOpenSceneGraph_13094'David Cole2012-08-203-4/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | dd60ed2 Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094 224b5de FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
| * \ \ \ Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094Philip Lowman2012-08-1830-391/+342
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved a few conflicts due to changes made in 13094 to paths Conflicts: Modules/FindOpenThreads.cmake Modules/Findosg_functions.cmake
| * | | | | FindOpenSceneGraph: CMake variable OSG_DIR influences detection now tooPhilip Lowman2012-08-183-4/+25
| | | | | |
* | | | | | Merge topic 'lib64-cleanup'David Cole2012-08-2030-391/+342
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | cfe4ac4 use PATH_SUFFIXES to simplify find_* calls b04650e use the find_* functions ENV parameter
| * | | | | use PATH_SUFFIXES to simplify find_* callsRolf Eike Beer2012-08-1419-242/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially remove "lib64" when the given paths are all Unix ones and "lib" is also explicitely given. In that case CMake will search "lib64" anyway for platforms where it is known to make sense.
| * | | | | use the find_* functions ENV parameterRolf Eike Beer2012-08-1428-151/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR. This will make sure the paths will get correctly handled through different platforms, especially on Windows. Also fixes one place where paths with windows delimiters (\) were hardcoded to use forward slashes.
* | | | | | Merge topic 'fix-13236-mark-vars-as-advanced'David Cole2012-08-201-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f9fa5c ProcessorCount: Mark find_program vars as advanced (#13236)
| * | | | | | ProcessorCount: Mark find_program vars as advanced (#13236)David Cole2012-08-171-0/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | After each find_program call, mark_as_advanced each find result variable to avoid polluting the cache with non-advanced variables
* | | | | | Merge topic 'cmcldeps-needs-cl'David Cole2012-08-201-18/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a35bd0 Ninja: don't crash on returned 0 pointer 3632f24 Ninja: cmcldeps needs a compiler
| * | | | | | Ninja: don't crash on returned 0 pointerPeter Kümmel2012-08-171-21/+18
| | | | | | |
| * | | | | | Ninja: cmcldeps needs a compilerPeter Kümmel2012-08-171-4/+7
| |/ / / / /
* | | | | | Merge topic 'fix-13315-incorrect-mfc-file-name'David Cole2012-08-201-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e6ea0 InstallRequiredSystemLibraries: Use correct file names (#13315)
| * | | | | | InstallRequiredSystemLibraries: Use correct file names (#13315)David Cole2012-08-171-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Spanish language MFC localization dll changed names from VS 9 to 10. Use the correct file name ending with "esn.dll" instead of the now non-existent one ending with "esp.dll" Also, add the existing, but missing from our rules until now, Russian language module. Alphabetize the list while we're at it for easier reading in the future. We may want to consider adding some file(GLOB code here to minimize the risk of missing files added in future versions of VS.
* | | | | | Merge topic 'HandleMacFrameworkIncludeDirs_13465'David Cole2012-08-202-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3815e6 -fix line length 9110d0e Eclipse on OSX: improve handling of framework include dirs (#13367) d97b385 Eclipse on OSX: fix handling of framework include dirs (#13464)
| * | | | | | -fix line lengthAlex Neundorf2012-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Eclipse on OSX: improve handling of framework include dirs (#13367)Alex Neundorf2012-08-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that if cmake finds something like the following: /System/Library/Frameworks/GLUT.framework/Headers Eclipse doesn't like that and wants to have /System/Library/Frameworks instead Alex
| * | | | | | Eclipse on OSX: fix handling of framework include dirs (#13464)Alex Neundorf2012-08-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OSX, the output from gcc looks like this: /usr/include/c++/4.2.1 /usr/include/c++/4.2.1/i686-apple-darwin10/x86_64 /usr/include/c++/4.2.1/backward /usr/lib/gcc/i686-apple-darwin10/4.2.1/include /usr/include /System/Library/Frameworks (framework directory) /Library/Frameworks (framework directory) End of search list. The "(framework directory)" part needs to be removed so that Eclipse handles it properly Alex
* | | | | | | Merge topic 'RemoveNonworkingKDE4Test'David Cole2012-08-202-104/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11f23fe remove non-working KDE4 test
| * | | | | | | remove non-working KDE4 testAlex Neundorf2012-08-162-104/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'EclipseRemoveLinkedOutputDirectoryResources'David Cole2012-08-202-91/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5271ba5 Eclipse: fix #13358: don't create bad linked resources
| * | | | | | | Eclipse: fix #13358: don't create bad linked resourcesAlex Neundorf2012-08-162-91/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory where the project file is located (${CMAKE_BINARY_DIR}), which can happen e.g. for EXECUTABLE_OUTPUT_PATH and related variables. Now, it seems this code never worked. If EXECUTABLE_OUTPUT_PATH was set to point into a subdir of CMAKE_BINARY_DIR, the code did nothing. If it pointed directly at CMAKE_BINARY_DIR or some other location, it created a linked resource. I tested this with Eclipse Europa (3.3) and Juno (4.2), and in this case both versions of Eclipse complained that this is a bad location for a linked resource. Alex
* | | | | | | Merge topic 'make-CPACK_CYGWIN_PATCH_NUMBER-cache'David Cole2012-08-201-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fc5efe Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variable
| * | | | | | | Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variableDavid Cole2012-08-161-3/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easy to override it, by priming the cache from a release build script, for example. Also: correct mistaken @@ variable references with plain ${} style references so that future readers do not think that it must be an input to configure_file...
* | | | | | | Merge topic 'qt4-path-search'David Cole2012-08-201-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35c6ae8 FindQt4: Give precedence to QTDIR environment variable, if set. 5a6a3d4 FindQt4: Give precedence to QTDIR environment variable, if set.
| * | | | | | | FindQt4: Give precedence to QTDIR environment variable, if set.Clinton Stimpson2012-08-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old search paths that aren't needed. Keep using PATHS instead of HINTS because a Windows machine may have a different Qt in its PATH and putting QTDIR and the registry entry ahead of PATH could cause apps to fail when run.
| * | | | | | | FindQt4: Give precedence to QTDIR environment variable, if set.Clinton Stimpson2012-08-161-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'qt4-version-regex'David Cole2012-08-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 4a772a1 Fix regex for qt minor version.
| * | | | | | | Fix regex for qt minor version.Clinton Stimpson2012-08-161-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
* | | | | | | Merge topic 'hg-modules'David Cole2012-08-205-4/+249
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91053cd ExternalProject: Add Mercurial (hg) repository support ea5bfb1 Add FindHg module to find Mercurial
| * | | | | | | ExternalProject: Add Mercurial (hg) repository supportBrad King2012-08-163-3/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add options HG_REPOSITORY and HG_TAG to specify an external project hosted in a Mercurial repository. Teach ExternalProject to clone the repository and update from it. Extend the ExternalProject test to try a Mercurial repository when hg is available.
| * | | | | | | Add FindHg module to find MercurialBrad King2012-08-142-1/+49
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Also teach the CMakeOnly.AllFindModules to verify Hg version detection.
* | | | | | | Merge topic 'relwithdebinfo-consistency'David Cole2012-08-2010-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ddfc51 Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.
| * | | | | | | Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.Clinton Stimpson2012-08-1610-10/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it was inconsistent in that some platforms/compilers had this flag for the RelWithDebInfo configuration and some didn't. This fixes issue #11366.
* | | | | | | Merge topic 'deployqt4-destdir'David Cole2012-08-201-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e3248c DeployQt4: Include DESTDIR for some cpack generators.