summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Swap linking order of SDLmain and SDL (#0013769)Benjamin Eikel2012-12-021-1/+1
|
* Merge branch 'fix-FindGettext-result' into releaseBrad King2012-11-261-2/+0
|\
| * FindGettext: fix overwriting result with empty variable (#13691)Rolf Eike Beer2012-11-261-2/+0
| | | | | | | | | | Remove stray line left by commit 656ab19b (FindGettext: remove code duplicating FPHSA checks, 2012-09-08).
* | Merge branch 'osx-sysroot-cleanup' into releaseBrad King2012-11-061-0/+1
|\ \
| * | OS X: Fix default CMAKE_OSX_SYSROOT with deployment targetBrad King2012-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett <matthew.brett@gmail.com> Reported-by: Bradley Giesbrecht <pixilla@macports.org>
* | | Merge branch 'fix-FindSDL-paths' into releaseBrad King2012-11-061-1/+2
|\ \ \
| * | | FindSDL: Restore accidentally dropped search paths (#13651)Brad King2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
* | | | Merge branch 'fix-PathScale-compiler-id' into releaseBrad King2012-11-062-16/+16
|\ \ \ \
| * | | | Fix PathScale compiler id for Clang-based upstreamBrad King2012-11-052-16/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__ before __clang__. Reported-by: C. Bergström <cbergstrom@pathscale.com>
* | | | FindOpenSSL: also find the non-MD debug libraries for MSVCRolf Eike Beer2012-11-051-0/+2
| | | | | | | | | | | | | | | | We already search for them in release mode.
* | | | FindOpenSSL: fix library selection on Windows (#13645)Rolf Eike Beer2012-11-051-0/+5
|/ / /
* | | Merge topic 'test-SelectLibraryConfigurations'David Cole2012-10-231-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | a22f4fa SelectLibraryConfigurations: fix for release and debug libs being the same 5052fbc SelectLibraryConfigurations: add testcase
| * | | SelectLibraryConfigurations: fix for release and debug libs being the sameRolf Eike Beer2012-10-211-5/+9
| | | |
* | | | Merge topic 'fix-SelectLibraryConfigurations-regression'David Cole2012-10-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1cd2ec1 SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax
| * | | | SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntaxThomas Arcila2012-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | In commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28) the "IN" keyword was left out.
* | | | | BasicConfigVersion: Make docs refer to the macro, not the module nameStephen Kelly2012-10-232-2/+2
| |/ / / |/| | | | | | | | | | | | | | | The -ExactVersion variant already refers to the macro, and I think it makes more sense anyway.
* | | | Merge topic 'refactor-CTestUseLaunchers'David Cole2012-10-172-12/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d63eb0b CTest: Ensure CTEST_USE_LAUNCHERS behaves nicely in Superbuild setup
| * | | | CTest: Ensure CTEST_USE_LAUNCHERS behaves nicely in Superbuild setupJean-Christophe Fillion-Robin2012-10-162-12/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building a project relying on External projects, the launchers were not used in subprojects built without testing enabled. This was preventing errors and warnings associated with these subprojects from being reported on the dashboard. This commit allows enabling the launchers independently of the value of "BUILD_TESTING" using one of these two approaches: 1) By setting both CTEST_USE_LAUNCHERS and the env variable "CTEST_USE_LAUNCHERS_DEFAULT" to 1 in the ctest dashboard driver scripts. 2) By enabling the variable CTEST_USE_LAUNCHERS in the ctest dashboard driver script and also by ensuring every external project passes the option -DCMAKE_PROJECT_<projectname>_INCLUDE:FILEPATH=${CMAKE_ROOT}/Modules/CTestUseLaunchers.cmake
* | | | | Merge topic 'fix-13578-wrong-reg-key'David Cole2012-10-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 12c092c NSIS: Fix incorrect uninstall registry key name (#13578)
| * | | | | NSIS: Fix incorrect uninstall registry key name (#13578)David Cole2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Alexander for the bug report.
* | | | | | Merge topic 'fix-postgres-debian'David Cole2012-10-171-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cbc1e5 Find PostgreSQL headers on Debian
| * | | | | | Find PostgreSQL headers on DebianPere Nubiola i Radigales2012-10-151-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes Debian bug 665721 (http://bugs.debian.org/665721)
* | | | | | FortranCInterface: Pass all flags to VERIFY project (#13579)Brad King2012-10-101-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach FortranCInterface_VERIFY to build the test project in a specific configuration and pass all flags for that configuration. This ensures that any modifications made by the user or project to the flag are used in the test project consistently.
* | | | | Merge topic 'DocumentCMakeFindPackageName'Brad King2012-10-091-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e2b1630 Document CMAKE_FIND_PACKAGE_NAME
| * | | | | Document CMAKE_FIND_PACKAGE_NAMEAlex Neundorf2012-10-041-0/+3
| |/ / / / | | | | | | | | | | | | | | | Alex
* | | | | FindGTK2: Update local changelogPhilip Lowman2012-10-031-2/+5
| | | | |
* | | | | FindGTK2: #12596 Missing paths for FindGTK2 on NetBSDPhilip Lowman2012-10-031-0/+2
| | | | |
* | | | | FindGTK2: #12049 fix detection of header files on multiarch systemsPhilip Lowman2012-10-031-0/+7
| | | | |
* | | | | FindGTK2: Rollback lib64 changes which broke header file findingPhilip Lowman2012-10-031-11/+26
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in "use PATH_SUFFIXES to simplify find_* calls" on 8/14 regressed important functionality in FindGTK for using find_path to locate header files in <prefix>/lib/<gtk_package>/include. The find_path function doesn't search <prefix>/lib only <prefix>/include.
* | | | Merge topic 'ninja-LIBPATH'Brad King2012-10-023-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e47ccb Ninja: add option to enforce usage of response files e31df03 Ninja: move <OBJECTS> in front of the first linker option 8d674e7 Ninja: move -LIBPATH behind -link option
| * | | | Ninja: move <OBJECTS> in front of the first linker optionPeter Kümmel2012-10-013-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the response file also linker options could be passed, and because <OBJECTS> is replaced by a response file, it is necessary that no compiler option follows <OBJECTS>.
* | | | | Merge topic 'ninja-link-rsp-expand'Brad King2012-10-022-11/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | dbd99d6 Revert "Ninja: don't expand any rsp files" f1670ab Ninja: don't confuse ninja's rsp files with nmake's
| * | | | Revert "Ninja: don't expand any rsp files"Bill Hoffman2012-10-012-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517. Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with nmake's, 2012-09-26) Ninja generator response files are placed in CMakeFiles/ so the previously existing check already avoids expanding them.
* | | | | Merge topic 'FindCURL-libcurl'Brad King2012-10-021-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 708b53e FindCURL: Find older MSVC prebuilts
| * | | | | FindCURL: Find older MSVC prebuiltsAndreas Mohr2012-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Older Windows MSVC CURL prebuilts have the .lib named as "libcurl.lib".
* | | | | | Merge topic 'documentation-cleanup'Brad King2012-10-012-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ad0233 Remove period at the end of the check message. 50b1ea5 Fix minor typos. 19c3206 Remove unused parameter marker and the unused parameter. 9d462b2 Document that generator expressions can be used in target properties. daf88c3 Fix punctuation in some variables documentation. 3172cde Fix the layout of the generator expression documentation.
| * | | | | | Remove period at the end of the check message.Stephen Kelly2012-09-292-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Other messages don't have one.
* | | | | | Merge topic 'export-sets'Brad King2012-10-012-1/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80112da Merge topic 'AutomocUseTargetProperties' into export-sets 955b966 exports: add a test for exporting dependent targets 6f50a04 exports: define a CMAKE_FIND_PACKAGE_NAME var set by find_package() 0cfd055 exports: move the handling of missing targets into subclasses 190f2c8 exports: fix build with MSVC6 8b5f448 exports: first try at error handling if a target is missing 87f4c01 exports: accept a missing target if it is exported exactly once 999061a exports: store pointers to all installations of each export set 64b3a6c exports: cmGlobalGenerator::ExportSets destructor will clear it 81cdab5 exports: Hold an ExportSet pointer in cm*Export*Generator 5c898fb exports: Add cmExportSetMap class d13ec1a exports: Create class cmExportSet 4e2347c exports: Rename cmGlobalGenerator::AddTargetToExport{s,} e846e70 exports: Remove cmTargetExport constructor 81c66c8 exports: Move cmTargetExport to a dedicated header file ae4ab62 find_package: add support for a <package>_NOT_FOUND_MESSAGE variable ...
| * | | | | Merge topic 'AutomocUseTargetProperties' into export-setsAlex Neundorf2012-09-307-129/+149
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Source/cmGlobalGenerator.h
| * | | | | | find_package: add support for a <package>_NOT_FOUND_MESSAGE variableAlex Neundorf2012-09-282-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a config-file sets <package>_FOUND to FALSE, it can now give a reason using the variable <package>_NOT_FOUND_MESSAGE, which is used by cmFindPackage and FPHSA. Alex
| * | | | | | Modules/readme.txt: fix typoAlex Neundorf2012-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'fix-13549-make-findmpi-quiet'David Cole2012-09-281-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b7a5c6 FindMPI: Set correct variables for calls to FPHSA
| * | | | | | | FindMPI: Set correct variables for calls to FPHSADavid Cole2012-09-271-0/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since FPHSA is called for multiple compiler languages with "MPI_${lang}" rather than just "MPI", make sure variables for controlling QUIET, REQUIRED and VERSION are propagated with names prefixed by MPI_${lang} as well, rather than just MPI. The find_package call sets up the values of MPI_FIND_REQUIRED and friends, but these calls to FPHSA need MPI_${lang}_FIND_REQUIRED and friends in order to function as intended.
* | | | | | | Merge topic 'ctest-svn-non-interactive'David Cole2012-09-281-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | 9ace801 ctest_update: Tell svn not to prompt interactively (#13024)
| * | | | | | ctest_update: Tell svn not to prompt interactively (#13024)Nils Gladitz2012-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, add SVNOptions/CTEST_SVN_OPTIONS configuration settings to add options to all svn invocations instead of just "svn update".
* | | | | | | Merge topic 'AutomocUseTargetProperties'David Cole2012-09-251-1/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e83cc94 Use the cmGeneratorTarget for the include directories API. 9d8e59d Merge branch 'use-generator-target' into AutomocUseTargetProperties ea12871 Automoc: also the makefile-COMPILE_DEFINITIONS 894e91a Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONS 825d1ab Automoc: fix #13493, use target properties for include dirs
| * | | | | | Merge branch 'use-generator-target' into AutomocUseTargetPropertiesStephen Kelly2012-09-1959-872/+1564
| |\ \ \ \ \ \
| * | | | | | | Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONSAlex Neundorf2012-09-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs say that this is for cmake 2.4 backwards compatibility only, so we probably don't need to support it. Alex
* | | | | | | | Merge topic 'osx-sysroot-cleanup'David Cole2012-09-259-94/+126
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df92864 OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id e7e613e OS X: Teach deployment target sanity check about SDK names 43b7479 OS X: Further improve default CMAKE_OSX_SYSROOT selection 2690738 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default 7995722 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES 1786b12 OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK name 242f673 Tests/Assembler: Use CMAKE_OSX_SYSROOT to generate .s file a1c032b bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot 230ea21 OS X: Improve default CMAKE_OSX_SYSROOT selection a0a0877 OS X: Always generate -isysroot if any SDK is in use 33a60e6 Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULT
| * | | | | | | OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler idBrad King2012-09-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode honors this environment variable if the project file does not set it. Hide it from Xcode while building the compiler id project.