summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmCommonTargetGenerator: Adopt GetDefines methodBrad King2015-07-094-29/+28
| | | | | Move the member up from cmMakefileTargetGenerator so it can be re-used later by cmNinjaTargetGenerator.
* cmCommonTargetGenerator: Adopt GetFlags methodBrad King2015-07-096-103/+56
| | | | | De-duplicate per-target flag computation in Makefile and Ninja target generators.
* cmNinjaTargetGenerator: Add OX X framework flagsBrad King2015-07-091-2/+4
| | | | | Teach ComputeFlagsForObject to add -F flags just like the Makefile generator does.
* cmMakefileTargetGenerator: Fix comment typoBrad King2015-07-091-1/+1
|
* cmNinjaTargetGenerator: Factor out AddIncludeFlags helperBrad King2015-07-092-16/+25
| | | | | Factor an AddIncludeFlags method out of ComputeFlagsForObject just like cmMakefileTargetGenerator has already.
* cmNinjaTargetGenerator: Add Fortran flag generationBrad King2015-07-091-7/+12
| | | | | Make ComputeFlagsForObject consistent with the Makefile generator in regard to Fortran flags.
* cmCommonTargetGenerator: Adopt GetFrameworkFlagsBrad King2015-07-094-64/+65
| | | | Move the member up from cmMakefileTargetGenerator.
* cmCommonTargetGenerator: Adopt AppendFortranFormatFlagsBrad King2015-07-094-32/+34
| | | | Move up from cmMakefileTargetGenerator.
* cmCommonTargetGenerator: Adopt AddFortranFlags and friendsBrad King2015-07-094-104/+105
| | | | | Move AddFortranFlags, GetFortranModuleDirectory, and supporting members up from cmMakefileTargetGenerator.
* cmCommonTargetGenerator: Adopt Convert methodBrad King2015-07-093-12/+15
| | | | Move it up from cmMakefileTargetGenerator.
* cmCommonTargetGenerator: Adopt ModuleDefinitionFile memberBrad King2015-07-097-70/+39
| | | | | De-duplicate the ModuleDefinitionFile and AddModuleDefinitionFlag members from the Makefile and Ninja target generators.
* cmCommonTargetGenerator: Adopt GetFeature and friendsBrad King2015-07-096-63/+34
| | | | | De-duplicate the GetFeature, GetFeatureAsBool, and AddFeatureFlags members from the Makefile and Ninja target generators.
* cmCommonTargetGenerator: Adopt ConfigName memberBrad King2015-07-096-9/+9
| | | | De-duplicate the member from the Makefile and Ninja target generators.
* cmLocalCommonGenerator: Adopt ConfigName memberBrad King2015-07-096-38/+24
| | | | De-duplicate the member from the local Makefile and Ninja generators.
* cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessorBrad King2015-07-094-17/+18
| | | | | Rename internal member from ConfigurationName to ConfigName to match the ninja generator.
* cmCommonTargetGenerator: Adopt basic target generator membersBrad King2015-07-096-16/+28
| | | | | De-duplicate the GeneratorTarget, Target, and Makefile members from the local Makefile and Ninja generators.
* Add common base classes to Makefile and Ninja generatorsBrad King2015-07-0920-16/+177
| | | | Provide a place to move functionality common to both.
* Merge topic 'FindXercesC-versioned-library'Brad King2015-07-091-1/+1
|\ | | | | | | | | d3d4d627 FindXercesC: Find versioned library on Windows
| * FindXercesC: Find versioned library on WindowsRoger Leigh2015-07-081-1/+1
| |
* | Merge topic 'cpack-ifw-framework-version'Brad King2015-07-091-2/+4
|\ \ | | | | | | | | | | | | ad5c76af CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION
| * | CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSIONKonstantin Podsvirov2015-07-081-2/+4
| | | | | | | | | | | | | | | | | | This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1 (CPackIFW: Add QtIFW 2.0 support, 2015-04-27). We need to load the CPackIFW module to initialize it if it is not set.
* | | Merge topic 'eclipse-cygwin-paths'Brad King2015-07-091-1/+2
|\ \ \ | | | | | | | | | | | | | | | | a672b16a Eclipse: Fix paths in target links on cygwin
| * | | Eclipse: Fix paths in target links on cygwinMarkus Grech2015-07-081-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Add a missing GetEclipsePath call to fix generation of incorrect paths for target links in Eclipse CDT generator which caused Eclipse to be unable to open files through such links. Without this the generator would generate invalid links for source files under "[Targets]", making Eclipse unable to open them. The old links looked like "C:/cygdrive/c/...", while new links correctly are "C:/...".
* | | Merge topic 'CheckCompilerFlag-do-not-use-FLAGS'Brad King2015-07-094-12/+19
|\ \ \ | | | | | | | | | | | | | | | | a639689c Check*CompilerFlag: Revert to previous method used to pass flags (#15641)
| * | | Check*CompilerFlag: Revert to previous method used to pass flags (#15641)Brad King2015-07-084-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used to pass flags, 2015-02-24) these check modules pass the flags to the compiler front-end during linking as well as during compilation. This breaks checks for flags like '-x c++' that are meant only for the compilation step. Revert the change and add a test covering a compiler-only flag.
* | | | Merge topic 'empty-LINK_LIBRARIES'Brad King2015-07-095-6/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7aa9e80e set_property: Fix crash when setting LINK_LIBRARIES to nothing
| * | | | set_property: Fix crash when setting LINK_LIBRARIES to nothingBrad King2015-07-085-6/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | We use a special dedicated structure to store the LINK_LIBRARIES target property. Do not try to construct a string from a NULL value. Instead leave the property structure empty when no value is given. Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
* | | | Merge topic 'update-kwsys'Brad King2015-07-091-93/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 65de27b8 Merge branch 'upstream-kwsys' into update-kwsys 42272a82 KWSys 2015-07-07 (8504e845)
| * \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-07-081-93/+58
| |\ \ \ \
| | * | | | KWSys 2015-07-07 (8504e845)KWSys Robot2015-07-081-93/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 8504e845 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 1f19c187..8504e845 Brad King (1): 8504e845 Process: Simplify Windows command line construction
* | | | | | CMake Nightly Date StampKitware Robot2015-07-091-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'string-append'Brad King2015-07-089-0/+107
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2b18cdca string: add APPEND subcommand
| * | | | | string: add APPEND subcommandDaniel Pfeifer2015-07-079-0/+107
| | | | | |
* | | | | | Merge topic 'preserve-generator-on-failure'Brad King2015-07-081-13/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b60232e cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
| * | | | | | cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)Brad King2015-07-071-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.4.0~4158 (When the initially configured generator is invalid, allow the user to change the generator without deleting the cache by hand, 2003-05-13) we remove CMAKE_GENERATOR from the cache if an error occurs and CMAKE_MAKE_PROGRAM is not cached. This worked at the time because all generators initialized the CMAKE_MAKE_PROGRAM cache entry. Since commit v3.0.0-rc1~260^2~4 (VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators, 2013-11-15) and commit v3.2.0-rc1~39^2 (Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator, 2015-01-28) the VS and Xcode generators no longer store CMAKE_MAKE_PROGRAM in the cache. Therefore any error during generation would wipe out CMAKE_GENERATOR from the cache and cause the next configuration to choose a default generator. Simply drop the behavior introduced by the original commit and always preserve CMAKE_GENERATOR. Since the time that behavior was introduced a lot more state is now saved in CMakeCache.txt and CMakeFiles/ during the initial configuration so it is not safe to change generators without starting fresh anyway.
* | | | | | | Merge topic 'cmake-install-components'Brad King2015-07-0811-24/+302
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ce7a663 Utilities/Sphinx: Add CMake_OPTIONAL_COMPONENT macro d7725a17 CMake: Add cmakexbuild component as REQUIRED to Tools group for IFW installer ecca2685 CMake: optional show LGPLv2.1 license when install cmake-gui component c14f20f7 CMake: Fix Web Site shortcut in IFW installer for Windows c823f04e CMake: New option CMake_INSTALL_COMPONENTS 7383e4d7 CMake: Install COMPONENTs (sphinx-man) 2531b909 CMake: Install COMPONENTs (QtDialog) 938bbc43 CMake: Install COMPONENTs
| * | | | | | | Utilities/Sphinx: Add CMake_OPTIONAL_COMPONENT macroBrad King2015-07-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building this directory independently define the macro since we will not get the definition from the top level of the source tree.
| * | | | | | | CMake: Add cmakexbuild component as REQUIRED to Tools group for IFW installerKonstantin Podsvirov2015-07-072-0/+12
| | | | | | | |
| * | | | | | | CMake: optional show LGPLv2.1 license when install cmake-gui componentKonstantin Podsvirov2015-07-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In IFW installer if cmake-gui component selected and CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL enabled license will be showed.
| * | | | | | | CMake: Fix Web Site shortcut in IFW installer for WindowsKonstantin Podsvirov2015-07-071-4/+4
| | | | | | | |
| * | | | | | | CMake: New option CMake_INSTALL_COMPONENTSKonstantin Podsvirov2015-07-078-60/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default is OFF. Now it's used with CPack IFW himself installer.
| * | | | | | | CMake: Install COMPONENTs (sphinx-man)Konstantin Podsvirov2015-07-073-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added component sphinx-man
| * | | | | | | CMake: Install COMPONENTs (QtDialog)Konstantin Podsvirov2015-07-071-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "COMPONENT cmake-gui" for all install commands in lists file
| * | | | | | | CMake: Install COMPONENTsKonstantin Podsvirov2015-07-0710-25/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added components: - cmake - ctest - cpack - cmake-gui - ccmake - data - sphinx-html - sphinx-singlehtml - sphinx-qthelp Other now Unspecified.
* | | | | | | | Merge topic 'add-apple-swift-language'Brad King2015-07-0826-0/+197
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf112531 Add rudimentary support for the Apple Swift language with Xcode
| * | | | | | | | Add rudimentary support for the Apple Swift language with XcodeBrad King2015-07-0626-0/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the `Swift` language to be enabled with the Xcode generator for Xcode >= 6.1. Reject it on other generators and with older Xcode versions. Since Apple is the only vendor implementing the language right now, the compiler id can be just `Apple`.
* | | | | | | | | Merge topic 'auto_export_dll_symbols'Brad King2015-07-0828-3/+884
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f86407c Windows: Optionally generate DLL module definition files automatically 069aa93b bindexplib: Add support for "/bigobj" format objects 61bbbdcf bindexplib: Fix treatment of some symbols de70c922 bindexplib: Teach DumpFile to return errors 8ea69dfe bindexplib: Build source as part of CMakeLib 2963cb2a bindexplib: Wrap long lines 4ff09893 bindexplib: Drop code that CMake does not need 7de8276c bindexplib: Add copyright/license notice block 65086ad7 bindexplib: Import original implementation from CERN
| * | | | | | | | Windows: Optionally generate DLL module definition files automaticallyBill Hoffman2015-07-0626-3/+455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create target property WINDOWS_EXPORT_ALL_SYMBOLS to automatically generate a module definition file from MS-compatible .obj files and give it to the linker in order to export all symbols from the .dll part of a SHARED library.
| * | | | | | | | bindexplib: Add support for "/bigobj" format objectsBill Hoffman2015-07-061-118/+176
| | | | | | | | |
| * | | | | | | | bindexplib: Fix treatment of some symbolsBill Hoffman2015-07-061-3/+16
| | | | | | | | |