summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Ninja: don't expand any rsp files"Bill Hoffman2012-10-014-28/+13
| | | | | | | | | 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.
* Ninja: don't confuse ninja's rsp files with nmake'sPeter Kümmel2012-09-283-5/+17
| | | | Move response files into CMakeFiles/ which makes them different to nmake's.
* CMake Nightly Date StampKitware Robot2012-09-281-1/+1
|
* CMake Nightly Date StampKitware Robot2012-09-271-1/+1
|
* CMake Nightly Date StampKitware Robot2012-09-261-1/+1
|
* Merge topic 'AutomocUseTargetProperties'David Cole2012-09-253-36/+27
|\ | | | | | | | | | | | | | | | | 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
| * Use the cmGeneratorTarget for the include directories API.Stephen Kelly2012-09-191-2/+3
| | | | | | | | | | Also, no need to get the include directories from the target beforehand. The local generator does that for us anyway.
| * Merge branch 'use-generator-target' into AutomocUseTargetPropertiesStephen Kelly2012-09-19224-2112/+19892
| |\
| * | Automoc: also the makefile-COMPILE_DEFINITIONSAlex Neundorf2012-09-061-0/+6
| | | | | | | | | | | | Alex
| * | Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONSAlex Neundorf2012-09-053-34/+6
| | | | | | | | | | | | | | | | | | | | | The docs say that this is for cmake 2.4 backwards compatibility only, so we probably don't need to support it. Alex
| * | Automoc: fix #13493, use target properties for include dirsAlex Neundorf2012-09-051-4/+16
| | | | | | | | | | | | Alex
* | | Merge topic 'use-generator-target'David Cole2012-09-2526-262/+378
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879fd35 Revert "Move GenerateTargetManifest to cmGeneratorTarget." 6674583 Fix compiler warning with initialization order. 5285458 Add convenience for getting a cmGeneratorTarget to use. c31f3d9 Add a wrapper for accessing config-specific compile-definitions. d1446ca Append the COMPILE_DEFINITIONS from the Makefile to all targets. 290e92a Move GetIncludeDirectories to cmGeneratorTarget. f9146f6 Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget. 9facfd1 Move GetCreateRuleVariable to cmGeneratorTarget. 78bfee3 Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget. 4f5384e Move GetLinkInformation to cmGeneratorTarget 987e12e Move GenerateTargetManifest to cmGeneratorTarget. 14bf778 Store cmGeneratorTargets with the makefile. f428ca2 Add more forwarding API to cmGeneratorTarget.
| * | | Revert "Move GenerateTargetManifest to cmGeneratorTarget."Stephen Kelly2012-09-205-79/+76
| | |/ | |/| | | | | | | | | | | | | | | | | | | This reverts commit 987e12e2f962b6e9ed9f15f8ff486512911b744e. GenerateTargetManifest is called by the global generator before it creates the generator targets, so we can't move it to cmGeneratorTarget yet.
| * | Fix compiler warning with initialization order.Stephen Kelly2012-09-191-1/+1
| | |
| * | Add convenience for getting a cmGeneratorTarget to use.Stephen Kelly2012-09-192-0/+7
| | |
| * | Add a wrapper for accessing config-specific compile-definitions.Stephen Kelly2012-09-195-12/+31
| | |
| * | Append the COMPILE_DEFINITIONS from the Makefile to all targets.Stephen Kelly2012-09-194-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | This way we don't need to check the definitions from the Makefile when generating later, and can more easily add generator expressions. Duplication is not a problem as the definitions are de-duplicated before generating.
| * | Move GetIncludeDirectories to cmGeneratorTarget.Stephen Kelly2012-09-1916-52/+68
| | |
| * | Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget.Stephen Kelly2012-09-196-26/+28
| | |
| * | Move GetCreateRuleVariable to cmGeneratorTarget.Stephen Kelly2012-09-195-24/+25
| | |
| * | Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget.Stephen Kelly2012-09-1913-49/+56
| | |
| * | Move GetLinkInformation to cmGeneratorTargetStephen Kelly2012-09-1913-78/+95
| | |
| * | Move GenerateTargetManifest to cmGeneratorTarget.Stephen Kelly2012-09-195-76/+79
| | |
| * | Store cmGeneratorTargets with the makefile.Stephen Kelly2012-09-194-6/+24
| | |
| * | Add more forwarding API to cmGeneratorTarget.Stephen Kelly2012-09-192-0/+36
| | | | | | | | | | | | This API is the most commonly required in the following patches.
* | | Merge topic 'osx-sysroot-cleanup'David Cole2012-09-2513-133/+154
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Tests/Assembler: Use CMAKE_OSX_SYSROOT to generate .s fileBrad King2012-09-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | On OS X if the user-provided flags do not include -isysroot and CMAKE_OSX_SYSROOT is defined then add the proper -isysroot flag to the C compiler invocation we use to generate the .s file.
| * | | bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysrootBrad King2012-09-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to bootstrap on OS X with Xcode without the command line tools one must add -isysroot to CFLAGS and CXXFLAGS. In this case the flags will make it into the configured CMake. Set CMAKE_OSX_SYSROOT to empty in the initial cache to prevent CMake from adding -isysroot again.
| * | | 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-218-40/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULTBrad King2012-09-211-10/+0
| | | | | | | | | | | | | | | | | | | | The condition for entering the block where the value is used can never be true anymore.
* | | | Merge topic 'qt5-qtdialog-port'David Cole2012-09-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 92b6d85 Enable deprecated API when using Qt 5.
| * | | | Enable deprecated API when using Qt 5.Stephen Kelly2012-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QAbstractItemModel::reset() method is deprecated in Qt 5, and therefore not part of the API by default (on non-Windows). The replacement for it is beginResetModel/endResetModel which are available from Qt 4.6 onwards. The minimum version of Qt required is currently 4.4, so enable the deprecated API instead of changing that.
* | | | | 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
| | | | | |
generated by cgit v0.12 at 2025-01-09 13:13:38 (GMT)