summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'compiler-id-refactor'Brad King2014-05-0839-442/+448
|\ | | | | | | | | | | | | | | | | | | | | 3b59f8b7 Project: Refactor C compiler determination into multiple files. 8896501b CompilerId: Allow specifying a prefix for preprocessor defines. 23f451bb CompilerId: Guard the platform-default compiler code with a parameter. 30a99f5c CompilerId: Add option to generate compiler-id-specific defines. 36ed5894 CompilerId: Allow specifying the compiler-specific components to generate. 9a083bce Project: Split the compiler id detection into a separate function. 9d285600 Project: Generate the CXX compiler Id test from multiple files.
| * Project: Refactor C compiler determination into multiple files.Stephen Kelly2014-05-0711-233/+94
| |
| * CompilerId: Allow specifying a prefix for preprocessor defines.Stephen Kelly2014-05-0721-79/+82
| |
| * CompilerId: Guard the platform-default compiler code with a parameter.Stephen Kelly2014-05-072-6/+7
| |
| * CompilerId: Add option to generate compiler-id-specific defines.Stephen Kelly2014-05-071-2/+12
| |
| * CompilerId: Allow specifying the compiler-specific components to generate.Stephen Kelly2014-05-072-3/+22
| |
| * Project: Split the compiler id detection into a separate function.Stephen Kelly2014-05-072-74/+101
| | | | | | | | | | This can be extended with parameters to control the output and re-used in other contexts.
| * Project: Generate the CXX compiler Id test from multiple files.Stephen Kelly2014-05-0728-218/+303
| | | | | | | | | | | | This will allow sharing of the logic of the order to test compilers in and the preprocessor macros used to do that and to determine the version components.
* | Merge topic 'ncurses-tinfo'Brad King2014-05-081-3/+15
|\ \ | | | | | | | | | | | | | | | 1f646c6c FindCurses: Detect and satisfy ncurses dependency on tinfo 0e4a2c7e FindCurses: Honor CURSES_NEED_NCURSES when curses is found
| * | FindCurses: Detect and satisfy ncurses dependency on tinfoMark Wright2014-05-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ncurses is built with USE=tinfo we need to find "tinfo" as a dependency of the main library. Otherwise 'cbreak' is missing: ld: ...: undefined reference to symbol 'cbreak' ld: note: 'cbreak' is defined in DSO /lib/libtinfo.so.5 so try adding it to the linker command line See https://bugs.gentoo.org/show_bug.cgi?id=468622 for more information. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | FindCurses: Honor CURSES_NEED_NCURSES when curses is foundMark Wright2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Take our CURSES_USE_NCURSES code path when CURSES_NEED_NCURSES is enabled even if CURSES_CURSES_LIBRARY also happens to be found. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | | Merge topic 'desktop-icon'Brad King2014-05-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 0c4c29ed cmake-gui: Fix desktop file icon configuration
| * | | cmake-gui: Fix desktop file icon configurationJohannes Huber2014-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the icon file extension. This fixes the desktop file validation message: "CMakeSetup32.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | CMake Nightly Date StampKitware Robot2014-05-081-1/+1
| | | |
* | | | Merge topic 'dev/source-file-performance'Brad King2014-05-074-51/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77b37965 cmSourceFile: Take a string 7b8a9904 perf: Cache the language property string 10baf00f cmSourceFile: Cache the isUiFile check 14e7a8ae cmSourceFileLocation: Return a string reference b4cb543e cmSourceFileLocation: Save some string copies e8e1f3a1 cmSourceFileLocation: Simplify logic in Matches 5554910e cmSourceFileLocation: Avoid string allocation in extension checking
| * | | | cmSourceFile: Take a stringBen Boeckel2014-04-291-1/+1
| | | | |
| * | | | perf: Cache the language property stringBen Boeckel2014-04-292-2/+6
| | | | |
| * | | | cmSourceFile: Cache the isUiFile checkBen Boeckel2014-04-292-3/+4
| | | | | | | | | | | | | | | | | | | | The filename extension call is expensive, so cache the .ui check.
| * | | | cmSourceFileLocation: Return a string referenceBen Boeckel2014-04-291-1/+1
| | | | |
| * | | | cmSourceFileLocation: Save some string copiesBen Boeckel2014-04-291-6/+6
| | | | |
| * | | | cmSourceFileLocation: Simplify logic in MatchesBen Boeckel2014-04-291-36/+35
| | | | |
| * | | | cmSourceFileLocation: Avoid string allocation in extension checkingBen Boeckel2014-04-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The substr call was causing excess allocations. Swap the cheaper character check to be before the longer string comparison, now using the prefix checking function.
* | | | | Merge topic 'dev/regex-variables'Brad King2014-05-075-42/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f517522 StoreMatches: Minor cleanups ef62fbad ClearMatches: Store match variable names statically f718b30a ClearMatches: Only clear matches which were actually set
| * | | | | StoreMatches: Minor cleanupsBen Boeckel2014-04-291-3/+3
| | | | | |
| * | | | | ClearMatches: Store match variable names staticallyBen Boeckel2014-04-291-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructing the names and then turning them into a std::string is non-negligible in performance testing.
| * | | | | ClearMatches: Only clear matches which were actually setBen Boeckel2014-04-295-42/+53
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClearMatches was clearing many variables which were never set in the first place. Instead, store how many matches were made last time and only clear those. It is moved to the cmMakefile class since it is a common utility used by multiple commands.
* | | | | Merge topic 'dev/hashmap-for-targets'Brad King2014-05-076-15/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 325599ca cmGlobalGenerator: Store targets in hash maps ac4106c6 cmMakefile: Use a hashmap for imported targets
| * | | | | cmGlobalGenerator: Store targets in hash mapsBen Boeckel2014-05-074-10/+17
| | | | | |
| * | | | | cmMakefile: Use a hashmap for imported targetsBen Boeckel2014-05-072-5/+9
| | | | | |
* | | | | | Merge topic 'dev/refactor-source-depends-in-ninja'Brad King2014-05-0712-59/+100
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2583eff6 ninja: Factor out custom command order-only depends 18e478a8 ninja: Factor out target-level order-only dependencies 6fa6bedf LocalGenerator: Add a string overload for AppendFlags 01b79c63 ninja: Don't use a stringstream to build an argument list 3c640891 ninja: Use string parameters
| * | | | | | ninja: Factor out custom command order-only dependsBen Boeckel2014-05-071-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes WebKitGTK's CMake build.ninja file go from 165M to 11M and configure/generate in 5 seconds.
| * | | | | | ninja: Factor out target-level order-only dependenciesBen Boeckel2014-05-072-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces ninja file output even more for projects with lots of libraries with entangled transitive dependencies. ParaView goes from the previous 58M to about 45M.
| * | | | | | LocalGenerator: Add a string overload for AppendFlagsBen Boeckel2014-05-078-20/+38
| | | | | | |
| * | | | | | ninja: Don't use a stringstream to build an argument listBen Boeckel2014-05-021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Streams are expensive to construct (looks like some locale-related stuff), so use strings instead.
| * | | | | | ninja: Use string parametersBen Boeckel2014-05-024-7/+8
| |/ / / / /
* | | | | | Merge topic 'compiler-id-comment'Brad King2014-05-072-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | c7ddd409 Project: Clarify comment about platform-native compilers.
| * | | | | Project: Clarify comment about platform-native compilers.Stephen Kelly2014-05-072-2/+2
| | | | | |
* | | | | | Merge topic 'no-assert-missing-objlib'Brad King2014-05-075-2/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d648c476 cmTarget: Don't assert on object libraries for configure-time location.
| * | | | | | cmTarget: Don't assert on object libraries for configure-time location.Stephen Kelly2014-05-065-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b8af2011 (cmTarget: Fix listing of source files at configure-time., 2014-04-13) refactored a GetObjectLibrariesCMP0026 method out of GetLanguages. In flight, a conditional use of a target if available was changed to an assert-available. This code is only used to read the LOCATION property at configure time, when the link information is incomplete, and not all targets are defined, so the assert is inappropriate, even though it can lead to incorrect information being generated. CMP0026 warns about the potentially incorrect information anyway.
* | | | | | | Merge branch 'release'Brad King2014-05-070-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'hpux-compile' into releaseBrad King2014-05-062-2/+38
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'backport-kwsys-compile-fix' into releaseBrad King2014-05-061-28/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'InstallRequiredSystemLibraries-vs12-mfc' into releaseBrad King2014-05-061-4/+21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'backport-kwsys-compile-fix'Brad King2014-05-070-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 8c5b9cf9 KWSys SystemInformation: Include backtrace APIs whenever we use them
| * | | | | | | | KWSys SystemInformation: Include backtrace APIs whenever we use themBrad King2014-05-061-28/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include execinfo.h, cxxabi.h, and dlfcn.h under the same conditions under which we use the APIs from them. Move their inclusion out of OS-specific blocks.
* | | | | | | | Merge topic 'osx-iframework'Brad King2014-05-073-3/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bed75a5 OS X: Use -iframework for system framework directories
| * | | | | | | | OS X: Use -iframework for system framework directoriesMikoĊ‚aj Siedlarek2014-05-073-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like -I flag has its -isystem counterpart which marks an include directory as a system directory and prevents unwanted warnings, on Apple systems there is -iframework -- a system directory replacement for -F. Use this flag to implement include_directories(SYSTEM) for frameworks.
* | | | | | | | | Merge topic 'xcode-sdkroot'Brad King2014-05-071-14/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dfe9b7d Xcode: Find fallback SDK if one matching the OS version doesn't exist.
| * | | | | | | | | Xcode: Find fallback SDK if one matching the OS version doesn't exist.Clinton Stimpson2014-05-061-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example if one installs Xcode 4.6 on OS X 10.9, it doesn't contain a 10.9 SDK, so fallback to the next newest version which, in this case, happens to be a 10.8 SDK. This fixes bug #14572.
* | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs12-mfc'Brad King2014-05-071-4/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c0a6646d InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)