summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindGIFAndFreetypeCleanupAndEnhancements'David Cole2011-08-022-36/+41
|\ | | | | | | | | | | | | | | 81a70c6 Add basic version check for giflib 2462f65 FindGif: add giflib4 as one more name for the library under Windows f97620e FindGIF/FindFreetype.cmake: remove standard search paths from find-calls 7c38523 Strip trailing whitespace
| * Add basic version check for giflibAlex Neundorf2011-08-011-2/+27
| | | | | | | | | | | | | | | | | | This is used e.g. in KDE, there on Solaris an old version of giflib was found (version 3), which could be detected by checking for the UserData member variable: http://websvn.kde.org/?view=revision&revision=545738 Alex
| * FindGif: add giflib4 as one more name for the library under WindowsAlex Neundorf2011-07-271-1/+1
| | | | | | | | Alex
| * FindGIF/FindFreetype.cmake: remove standard search paths from find-callsAlex Neundorf2011-07-272-21/+1
| | | | | | | | | | | | | | | | In both files find_path() and find_library() are called with multiple additional search PATHS which are already anyway part of the default search dirs, so it should be safe to remove them. Alex
| * Strip trailing whitespaceAlex Neundorf2011-07-272-12/+12
| | | | | | | | Alex
* | Merge topic 'FindPostgresqlImprovements'David Cole2011-08-021-30/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | 825c457 FindPostgreSQL: fix PATH_SUFFIXES, better output for FPHSA e159bb5 Mark the results from find() as advanced da1bdaf Use FPHSA(), remove unnecessary stuff and don't recommend link_directories() 217d068 More PATH_SUFFIXES for finding Postgresql and also search catalog/pg_type.h
| * | FindPostgreSQL: fix PATH_SUFFIXES, better output for FPHSAAlex Neundorf2011-08-011-5/+4
| | | | | | | | | | | | Alex
| * | Mark the results from find() as advancedAlex Neundorf2011-08-011-0/+2
| | | | | | | | | | | | Alex
| * | Use FPHSA(), remove unnecessary stuff and don't recommend link_directories()Alex Neundorf2011-08-011-38/+8
| | | | | | | | | | | | | | | | | | | | | -don't recommend using link_directories() -don't do the extra if(EXISTS) checks, since the code is already inside a if(PostgreSQL_FOUND) Alex
| * | More PATH_SUFFIXES for finding Postgresql and also search catalog/pg_type.hAlex Neundorf2011-08-011-0/+22
| |/ | | | | | | | | | | Patch from Jaroslaw Staniek, reviewed by Andrew Maclean Alex
* | Merge topic 'fix-11866-add-watcom-sys-libs'David Cole2011-08-023-0/+73
|\ \ | | | | | | | | | | | | | | | ff59716 Watcom: Use correct args for execute_process call (#11866) 80769cd Add Watcom support to InstallRequiredSystemLibraries (#11866)
| * | Watcom: Use correct args for execute_process call (#11866)David Cole2011-08-011-2/+2
| | | | | | | | | | | | | | | I botched an exec_program to execute_process translation on Friday. RESULT_VARIABLE is the correct argument to execute_process.
| * | Add Watcom support to InstallRequiredSystemLibraries (#11866)David Cole2011-07-293-0/+73
| | | | | | | | | | | | | | | | | | | | | Also adds code to determine the version of the Watcom compiler in use. Thanks to J Decker for the patch.
* | | Merge topic 'doc-WIN32-cygwin'David Cole2011-08-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 1f641de Documentation: WIN32 not defined on Cygwin (#12334)
| * | | Documentation: WIN32 not defined on Cygwin (#12334)Brad King2011-07-291-1/+1
| |/ / | | | | | | | | | | | | | | | Since commit 85c0a69a (Cygwin: Do not define 'WIN32', 2010-12-17) WIN32 is not defined on Cygwin. Update documentation of the WIN32 variable accordingly.
* | | Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject'David Cole2011-08-021-0/+7
|\ \ \ | | | | | | | | | | | | | | | | f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
| * | | Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)Alex Neundorf2011-07-291-0/+7
| |/ / | | | | | | | | | | | | | | | This causes that all files in C::B are displayed in a tree starting at / Alex
* | | Merge topic 'cpack-nsis-multi-installs'David Cole2011-08-023-15/+11
|\ \ \ | | | | | | | | | | | | | | | | e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
| * | | CPack/NSIS: Fix reinstall and multiple install issues when using components.Clinton Stimpson2011-07-293-15/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY. This allows different versions of software to have a separate sections in the registry to keep track of things (installed components, and uninstall stuff). Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another installation, the proper registry entries are more likely to be overwritten. Fix CPack/NSIS generator to not insert code in the NSIS template to skip installation of already installed components. This enables a repair like behavior and also enables installing patch releases on top of an older installation.
* | | Merge topic 'fix-12299-add-vs10-scc-support'David Cole2011-08-021-2/+17
|\ \ \ | | | | | | | | | | | | | | | | 05ddfbf VS10: Add SCC support
| * | | VS10: Add SCC supportSteven Velez2011-07-291-2/+17
| |/ / | | | | | | | | | | | | Honor the properties that were added for earlier versions of visual studio.
* | | Merge topic 'fix-12245-add-wlib--c-flag'David Cole2011-08-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | a0974ae Watcom: Add -c flag to wlib calls (#12245)
| * | | Watcom: Add -c flag to wlib calls (#12245)David Cole2011-07-291-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Allows wlib to generate proper exports if two routines have the same spelling, but different case (like Scale and scale). Thanks to J Decker for the patch.
* | | Merge topic 'adjust-path-for-all-generators-test'David Cole2011-08-021-0/+22
|\ \ \ | | | | | | | | | | | | | | | | 0baf565 Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators
| * | | Ensure libgmp-10.dll is in the PATH for CMakeTestAllGeneratorsDavid Cole2011-07-291-0/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | But only if it exists at the default location: C:/MinGW/bin/libgmp-10.dll This is so that the pop-up dialog about not being able to load that dll does not hang the test when there's nobody watching.
* | | Merge topic 'fix-updategit-test'David Cole2011-08-021-3/+5
|\ \ \ | | | | | | | | | | | | | | | | 0375865 Fix machine-specific UpdateGIT test failures
| * | | Fix machine-specific UpdateGIT test failuresDavid Cole2011-07-291-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Generated Update.xml file is larger than the previously hard-coded limit of 4096. Introduce variable max_update_xml_size and bump it up to 16k for reliable test runs.
* | | | Merge topic 'fix-8707-add-vs-globals'David Cole2011-08-025-6/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | df95772 Add support for Visual Studio project-specific globals (#8707)
| * | | | Add support for Visual Studio project-specific globals (#8707)David Cole2011-07-295-6/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Pau Garcia i Quiles for the inspiration for the patch. I've tweaked it a bit compared to what's in the bug tracker: this commit does not allow empty global variable names. I also added usage of the new feature to an existing test. Although it has no effect on the resulting Visual Studio projects, you can verify that the VSResource test produces a non-empty globals section in the generated .vcproj(x) files.
* | | | Merge topic 'qt4-use-check-cxx-symbol'David Cole2011-08-021-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | de30173 Remove C compiler requirement from FindQt4.cmake
| * | | | Remove C compiler requirement from FindQt4.cmakeClinton Stimpson2011-07-282-8/+7
| |/ / / | | | | | | | | | | | | | | | | Use the new check_cxx_symbol_exists instead of check_symbol_exists. Also remove a debug message from CheckSymbolExists.cmake.
* | | | Merge topic 'RemoveDebugOutput'David Cole2011-08-021-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6b71bf8 Remove debug output from CheckSymbolExists
| * | | | Remove debug output from CheckSymbolExistsAlex Neundorf2011-07-291-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | ...which shouldn't have been committed. Alex
* | | | Merge topic 'split-stdout-stderr'David Cole2011-08-0215-53/+103
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a343bc1 RunSingleCommand: Avoid assignment in condition 642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag. 856a9e4 RunSingleCommand: Replace verbose boolean with enum 4096066 RunSingleCommand: Fix indentation
| * | | | RunSingleCommand: Avoid assignment in conditionBrad King2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Several compilers warn about this case even when an extra layer of parenthesis surrounds the assignment. Make the condition explicit.
| * | | | RunSingleCommand: Add a OUTPUT_NORMAL flag.Johan Björk2011-07-285-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | OUTPUT_NORMAL does no processing of the output streams, it just passes them through the same streams as they were received on.
| * | | | RunSingleCommand: Replace verbose boolean with enumJohan Björk2011-07-2813-35/+53
| | | | | | | | | | | | | | | | | | | | | | | | | No behaviour change, this prepares for adding a flag to skip the merging of output streams.
| * | | | RunSingleCommand: Fix indentationBrad King2011-07-281-18/+18
| | | | |
* | | | | Merge topic 'cmSystemTools-whitespace'David Cole2011-08-022-118/+118
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | acd2f84 cmSystemTools: Remove trailing whitespace
| * | | | cmSystemTools: Remove trailing whitespaceBrad King2011-07-282-118/+118
| | | | |
* | | | | Merge topic 'add-flag-detection-regex'David Cole2011-08-021-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b7f3f7c Add fail regex to detect supported warning flags correctly.
| * | | | | Add fail regex to detect supported warning flags correctly.David Cole2011-07-271-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Apple's gcc, the compiler emits a warning such as "warning: command line option "-Wno-deprecated" is valid for C++/ObjC++ but not for C" when it is passed that flag on its command line. When testing for that flag with a plain C file, we should report that the flag is unsupported for C files. The new FAIL_REGEX option added here produces this behavior.
* | | | | Merge topic 'library-multiarch-issue-12326'David Cole2011-08-021-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 317d077 multiarch: Treat lib/<arch> as implicit link dir (#12326)
| * | | | | multiarch: Treat lib/<arch> as implicit link dir (#12326)Modestas Vainius2011-07-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add multiarch library directories to the set of implicit link directories. In particular, this keeps lib/<arch> out of R(UN)PATH.
* | | | | | Merge topic 'FeatureSummaryImprovements'David Cole2011-08-022-87/+320
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b62349c FeatureSummary.cmake: update documentation f366cf8 FeatureSummary.cmake: cosmetics f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs 02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing 91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword 0671a02 FeatureSummary.cmake: remove "comment" field aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE
| * | | | | | FeatureSummary.cmake: update documentationAlex Neundorf2011-07-171-18/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | FeatureSummary.cmake: cosmeticsAlex Neundorf2011-07-171-34/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -move the compat function to the bottom of the file -make all except one endif() empty Alex
| * | | | | | FeatureSummary.cmake: only higher TYPEs can override previous TYPEsAlex Neundorf2011-07-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way e.g. a REQUIRED cannot become OPTIONAL, only the other way round Alex
| * | | | | | FeatureSummary.cmake: error out when a REQUIRED package is missingAlex Neundorf2011-07-171-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keywordAlex Neundorf2011-07-172-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now found packages are not stored in ENABLED/DISABLED_FEATURES anymore, but always in PACKAGES_FOUND/NOT_FOUND. ENABLED/DISABLED_FEATURES is now only used via ADD_FEATURE_INFO(), e.g. for stuff set via option(). Alex