summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | OS X: Teach deployment target sanity check about SDK namesBrad King2012-09-221-20/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 1786b121 (OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK name, 2012-09-21) we support names like "macosx" or "macosx10.7" as the specified value of CMAKE_OSX_SYSROOT. Extend the SDK name->path conversion to save the original value and also convert into a temporary variable for the Xcode generator. Re-implement the deployment target sanity check to detect the version from the transformed path.
| * | | | OS X: Further improve default CMAKE_OSX_SYSROOT selectionBrad King2012-09-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 230ea218 (OS X: Improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we always set CMAKE_OSX_SYSROOT if any SDK is found in order to support Makefile generator builds with Xcode >= 4.3 without the command-line tools installed. However, in the basic POSIX-only case of the Makefile generator with command-line tools and no CMAKE_OSX_ARCHITECTURES we should not select any SDK by default.
| * | | | OS X: If CMAKE_OSX_SYSROOT is already set do not compute defaultBrad King2012-09-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The default computation logic is non-trivial. Do not bother with it if the value is already known.
| * | | | OS X: Simplify selection of CMAKE_OSX_ARCHITECTURESBrad King2012-09-211-23/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Incremental changes to the logic over time have led to simply initializing the cache entry with the environment value.
| * | | | OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK nameBrad King2012-09-211-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode supports SDKROOT values that just name an SDK rather than specifying the full path to it. Recognize these values and handle them. For Xcode we just put the value directly in the generated project file. For Makefile generators we ask xcodebuild to provide the full path to the named SDK. Suggested-by: Jason DiCioccio <jd@ods.org>
| * | | | OS X: Improve default CMAKE_OSX_SYSROOT selectionBrad King2012-09-211-44/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the search for OSX_DEVELOPER_ROOT and allow it to fail if no "/Developer" exists. When it does exist, always find a MacOSX SDK inside it to use as the default CMAKE_OSX_SYSROOT. Otherwise set CMAKE_OSX_SYSROOT to empty.
| * | | | OS X: Always generate -isysroot if any SDK is in useBrad King2012-09-217-11/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Drop the last use of CMAKE_OSX_SYSROOT_DEFAULT. Replace internal platform variable CMAKE_${lang}_HAS_ISYSROOT with a more general CMAKE_${lang}_SYSROOT_FLAG variable. If the -isysroot flag exists and CMAKE_OSX_SYSROOT points to an SDK (not "/") then always add it to compiler command lines. This is already done in the Xcode IDE.
* | | | Merge topic 'ImproveFindSDLxxxModules'David Cole2012-09-256-189/+285
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68c6b13 FindSDL: Stay compatible with old input variables 9ed24c5 FindSDL: Remove from find_... calls PATHS that are set by default 38a0f71 FindSDL: Add my copyright tag to all FindSDL_* modules 020d213 FindSDL: Add version support 61a566c FindSDL: Format documentation 22154c7 FindSDL: Update documentation 4541c07 FindSDL: Add version support for FindSDL_ttf a28c247 FindSDL: Use SDL_TTF prefix for variables 9f5dbf4 FindSDL: Update documentation d83f80d FindSDL: Add version support for FindSDL_mixer c10b691 FindSDL: Use SDL_MIXER prefix for variables 03dd6cc FindSDL: Pass SDL_SOUND_LIBRARY to FIND_PACKAGE_HANDLE_STANDARD_ARGS 326beca FindSDL: Use same capitalization for FPHSA as file name cfe5b87 FindSDL: Version support for FindSDL_sound 776d3fe FindSDL: Format the documentation a5194e2 FindSDL: Add "cmake_minimum_required" to "try_compile" project ...
| * | | | FindSDL: Stay compatible with old input variablesBenjamin Eikel2012-09-254-0/+32
| | | | | | | | | | | | | | | | | | | | Suggested-by: David Cole <david.cole@kitware.com>
| * | | | FindSDL: Remove from find_... calls PATHS that are set by defaultBenjamin Eikel2012-09-256-116/+7
| | | | | | | | | | | | | | | | | | | | Use PATH_SUFFIXES to add SDL parts to standard paths.
| * | | | FindSDL: Add my copyright tag to all FindSDL_* modulesBenjamin Eikel2012-09-256-0/+6
| | | | |
| * | | | FindSDL: Add version supportBenjamin Eikel2012-09-251-1/+19
| | | | |
| * | | | FindSDL: Format documentationBenjamin Eikel2012-09-251-10/+10
| | | | |
| * | | | FindSDL: Update documentationBenjamin Eikel2012-09-251-5/+11
| | | | |
| * | | | FindSDL: Add version support for FindSDL_ttfBenjamin Eikel2012-09-251-1/+18
| | | | |
| * | | | FindSDL: Use SDL_TTF prefix for variablesBenjamin Eikel2012-09-251-4/+14
| | | | |
| * | | | FindSDL: Update documentationBenjamin Eikel2012-09-251-5/+11
| | | | |
| * | | | FindSDL: Add version support for FindSDL_mixerBenjamin Eikel2012-09-251-1/+18
| | | | |
| * | | | FindSDL: Use SDL_MIXER prefix for variablesBenjamin Eikel2012-09-251-4/+14
| | | | |
| * | | | FindSDL: Pass SDL_SOUND_LIBRARY to FIND_PACKAGE_HANDLE_STANDARD_ARGSBenjamin Eikel2012-09-251-1/+1
| | | | |
| * | | | FindSDL: Use same capitalization for FPHSA as file nameBenjamin Eikel2012-09-251-1/+1
| | | | |
| * | | | FindSDL: Version support for FindSDL_soundBenjamin Eikel2012-09-251-1/+19
| | | | |
| * | | | FindSDL: Format the documentationBenjamin Eikel2012-09-251-23/+21
| | | | |
| * | | | FindSDL: Add "cmake_minimum_required" to "try_compile" projectBenjamin Eikel2012-09-251-1/+2
| | | | |
| * | | | FindSDL: Use SDL_IMAGE prefix for varibalesBenjamin Eikel2012-09-251-25/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes FindPackageHandleStandardArgs and FeatureSummary work correctly. Keep old variables for compatibility. Furthermore, format the documentation.
| * | | | FindSDL: Use prefix SDL_NET, because it matches the file name.Benjamin Eikel2012-09-251-25/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Add new variables, keep the old ones for compatibility. Format the documentation header.
| * | | | FindSDL: Version support for FindSDL_imageBenjamin Eikel2012-09-251-1/+19
| | | | |
| * | | | FindSDL: Add version support for FindSDL_netBenjamin Eikel2012-09-251-1/+19
| | | | |
* | | | | Merge topic 'DetermineVsServicePack2012'David Cole2012-09-251-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a722780 CMakeDetermineVSServicePack: Visual Studio 2012 added
| * | | | | CMakeDetermineVSServicePack: Visual Studio 2012 addedPhilip Lowman2012-09-221-0/+3
| | |/ / / | |/| | |
* | | | | Merge topic 'clang-PIE'David Cole2012-09-254-3/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ada9efd Clang: All versions know about -fPIE (#13550) 6e34aea Clang: Split Compiler/Clang* modules out from GNU (#13550)
| * | | | | Clang: All versions know about -fPIE (#13550)Brad King2012-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU compiler information file tests for GNU >= 3.4 because earlier versions do not have the flag. The version number test is not valid for Clang compiler versions, but we know Clang supports the flag.
| * | | | | Clang: Split Compiler/Clang* modules out from GNU (#13550)Brad King2012-09-194-3/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Clang presents an almost identical interface to GNU there will be some differences. Split the compiler information modules to allow separate rules for Clang. Start by loading the GNU rules but leave a place to add Clang-specific information.
* | | | | Merge topic 'file-DOWNLOAD-EXPECTED_HASH'David Cole2012-09-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 95a0011 file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=value
| * | | | file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=valueBrad King2012-09-191-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Make the EXPECTED_HASH option take only a single value instead of two to avoid handling sub-keyword arguments. This is also consistent with URL_HASH in ExternalProject.
* | | | Merge topic 'vs-link-rsp'Brad King2012-09-192-5/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5598d9b Ninja: don't expand any rsp files
| * | | | Ninja: don't expand any rsp filesPeter Kuemmel2012-09-192-5/+11
| | | | |
* | | | | Merge topic 'ExternalProject-DOWNLOAD_NAME'Brad King2012-09-191-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8da0fe4 ExternalProject: Add DOWNLOAD_NAME option
| * | | | | ExternalProject: Add DOWNLOAD_NAME optionBrad King2012-09-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some download URLs do not have the filename embedded in the url. Add an interface to specify the local filename explicitly. Suggested-by: James Goppert <james.goppert@gmail.com>
* | | | | | Merge topic 'vs11-express'Brad King2012-09-192-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ee3cee VS11: Add VS 2012 Express support (#13348) e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
| * | | | | | VS11: Add VS 2012 Express support (#13348)Brad King2012-09-182-6/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the registry entries that vsvars32.bat uses to detect the location of MSBuild.exe in the framework directory. Invoke MSBuild with the option /p:VisualStudioVersion=$version so it knows from which VS version to load the system build rules. Teach cmGlobalVisualStudio11Generator to set its ExpressEdition member using the registry.
* | | | | | Merge topic 'osx-clang-target-flags'Brad King2012-09-193-0/+30
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
| * | | | | OS X: Add platform-specific Clang compiler info files (#13536)Brad King2012-09-173-0/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang has the same interface as GNU except that we do not need to test for the deployment target and sysroot flags. Simply set variables CMAKE_${lang}_HAS_ISYSROOT CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG to true because every version of Clang available on OS X supports these flags.