summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: also detect /showInclude prefix for iclPeter Kümmel2012-08-271-7/+4
|
* CMake Nightly Date StampKitware Robot2012-08-271-1/+1
|
* CMake Nightly Date StampKitware Robot2012-08-261-1/+1
|
* CMake Nightly Date StampKitware Robot2012-08-251-1/+1
|
* Merge topic 'ide-compiler-id'David Cole2012-08-2418-252/+961
|\ | | | | | | | | | | | | | | | | | | | | | | 403ead6 Document CMAKE_<LANG>_COMPILER_(ID|VERSION) values 8be51f6 Test variables CMAKE_(C|CXX|Fortran)_COMPILER(|_ID|_VERSION) ec22a9b Cleanly enable a language in multiple subdirectories 66cb335 VS: Detect the compiler id and tool location 89595d6 VS10: Define CMAKE_VS_PLATFORM_TOOLSET variable 965a69d Xcode: Detect the compiler id and tool location 9a9e1ee CMakeDetermineCompilerId: Prepare to detect IDE compiler id b8b5c83 Re-order C/C++/Fortran compiler determination logic
| * Document CMAKE_<LANG>_COMPILER_(ID|VERSION) valuesBrad King2012-08-221-5/+27
| | | | | | | | | | These values are now available almost everywhere and are tested. Document them for general use and list possible ID values.
| * Test variables CMAKE_(C|CXX|Fortran)_COMPILER(|_ID|_VERSION)Brad King2012-08-224-0/+56
| | | | | | | | | | | | Add tests CMakeOnly.CompilerId(C|CXX|Fortran) to check that the basic compiler tool path, vendor, and version variables have been set as expected.
| * Cleanly enable a language in multiple subdirectoriesBrad King2012-08-221-11/+13
| | | | | | | | | | | | | | When a language is not enabled at the top level of a project but is enabled in multiple disjoint subdirectories we should re-use the CMake<lang>Compiler.cmake file from the first directory. Load the file whenever it exists and is not left from a different version of CMake.
| * VS: Detect the compiler id and tool locationBrad King2012-08-226-9/+223
| | | | | | | | | | | | | | Configure a hand-generated Visual Studio project to build the compiler id source file since we cannot run the compiler command-line tool directly. Add a post-build command to print out the full path to the compiler tool. Parse the full path to the compiler tool from the build output.
| * VS10: Define CMAKE_VS_PLATFORM_TOOLSET variableBrad King2012-08-223-0/+22
| | | | | | | | | | When the VS 10 generator selects a non-default PlatformToolset to specify for MSBuild, report the selected name in this variable.
| * Xcode: Detect the compiler id and tool locationBrad King2012-08-227-1/+387
| | | | | | | | | | | | | | | | Configure a hand-generated Xcode project to build the compiler id source file since we cannot run the compiler command-line tool directly. Add a post-build shell script phase to print out the compiler toolset build setting. Run xcodebuild to compile the identification binary. Parse the full path to the compiler tool from the xcodebuild output.
| * CMakeDetermineCompilerId: Prepare to detect IDE compiler idBrad King2012-08-221-27/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMAKE_DETERMINE_COMPILER_ID to check for variable CMAKE_${lang}_COMPILER_ID_TOOL after CMAKE_DETERMINE_COMPILER_ID_BUILD to use as CMAKE_${lang}_COMPILER since it will not be known until after the IDE runs. In CMAKE_DETERMINE_COMPILER_ID_BUILD prepare a cascading "if" so we can use a generator-specific method to compile the identification source file. Leave "if(0)" as a placeholder for now and put the direct compiler invocation in "else()". After running the compiler to build the compiler identification source we file(GLOB) the list of output files as candidates for extracting the compiler information. An IDE may create directories, so exclude exclude directories from this list.
| * Re-order C/C++/Fortran compiler determination logicBrad King2012-08-223-216/+207
| | | | | | | | | | | | | | | | | | | | | | | | Re-organize CMakeDetermine(C|CXX|Fortran)Compiler.cmake to search for the compiler command-line tool only under generators for which it makes sense. For the Visual Studio generators we do not expect to find the compiler tool from the environment, nor would we use the result anyway. Furthermore, set CMAKE_${lang}_COMPILER_ID_TEST_FLAGS only when it has a chance to be used. Extract _CMAKE_TOOLCHAIN_LOCATION from the compiler path after running the compiler id step so in the future that step can help find the path to the compiler.
* | Merge topic 'vs-AddPlatformDefinitions-cleanup'David Cole2012-08-2421-78/+43
|\ \ | |/ | | | | | | 2c7a451 VS: Cleanup AddPlatformDefinitions() of Visual Studio generators
| * VS: Cleanup AddPlatformDefinitions() of Visual Studio generatorsPatrick Gansterer2012-08-2221-78/+43
| | | | | | | | | | Move adding of definitions into cmGlobalVisualStudioGenerator to share code and avoid duplicate architecture string literals.
* | Merge topic 'more-compiler-versions'David Cole2012-08-242-6/+57
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9bc502 Detect Analog VisualDSP++ compiler version with its id cca386b Detect Cray compiler version with its id 622d9a7 Detect SDCC compiler version with its id 4ad7fa6 Detect Comeau compiler version with its id 952651c Detect TI compiler version with its id 74c57d9 Detect PathScale compiler version with its id 707aefd Detect Compaq compiler version with its id
| * | Detect Analog VisualDSP++ compiler version with its idBrad King2012-08-222-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode hex digits from __VISUALDSPVERSION__ to compute the version number components. Note that the constant encodes decimal digits as hex digits (never larger than 9). We represent them as decimal after extraction. See documentation at: http://download.analog.com/dsp/tools/VisualDSP_45_Update_6_Release_Note_v4.pdf http://www.analog.com/static/imported-files/software_manuals/50_asm_man.rev3.1.pdf Note that __VISUALDSPVERSION__ was introduced in version 4.5.6.
| * | Detect Cray compiler version with its idBrad King2012-08-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from _RELEASE _RELEASE_MINOR to compute version number components. See documentation at: http://docs.cray.com/books/S-2179-52/html-S-2179-52/zfixed5fvzxnxo.html http://sourceforge.net/p/predef/wiki/Compilers/#cray-c
| * | Detect SDCC compiler version with its idBrad King2012-08-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from SDCC to compute version number components. See documentation at: http://sdcc.sourceforge.net/doc/sdccman.pdf http://sourceforge.net/p/predef/wiki/Compilers/#small-device-c-compilerhttpenwikipediaorgwikismall_device_c_compiler
| * | Detect Comeau compiler version with its idBrad King2012-08-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __COMO_VERSION__ to compute the version number components. See documentation at: http://www.comeaucomputing.com/4.0/docs/userman/predefs.html http://sourceforge.net/p/predef/wiki/Compilers/#comeau-chttpenwikipediaorgwikicomeau_cc2b2b
| * | Detect TI compiler version with its idBrad King2012-08-222-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __TI_COMPILER_VERSION__ to compute version number components. See documentation at: http://processors.wiki.ti.com/index.php/Refer_to_Compiler_Version_in_Your_Source http://www.ti.com/general/docs/lit/getliterature.tsp?literatureNumber=spru187o http://sourceforge.net/p/predef/wiki/Compilers/#texas-instruments-cc-compiler
| * | Detect PathScale compiler version with its idBrad King2012-08-222-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __PATHCC__ __PATHCC_MINOR__ __PATHCC_PATCHLEVEL__ to compute version number components. See documentation at: http://www.pathscale.com/docs/UserGuide.pdf http://sourceforge.net/p/predef/wiki/Compilers/#ekopathhttpenwikipediaorgwikipathscale
| * | Detect Compaq compiler version with its idBrad King2012-08-222-0/+8
| |/ | | | | | | | | | | | | | | | | Decode decimal digits from __DECC_VER and __DECCXX_VER to compute version number components. See documentation at: http://www.openvms.compaq.com/commercial/c/docs/5492p024.html#decc_ver_sec http://www.tru64unix.compaq.com/cplus/ugu_impl.html#predef_vernum http://sourceforge.net/p/predef/wiki/Compilers/#compaq-cchttpwwwopenvmscompaqcomopenvmsbrochuresdeccplus
* | Merge topic 'vs11-flag-table'David Cole2012-08-245-15/+781
|\ \ | | | | | | | | | | | | | | | 9b2dda5 VS11: Generate flag tables from MSBuild V110 tool files 4cb99b1 cmparseMSBuildXML: Include DisplayName in the output
| * | VS11: Generate flag tables from MSBuild V110 tool filesBrad King2012-08-225-4/+770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on cl.xml, lib.xml, and link.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/cl.xml" > cmVS11CLFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/lib.xml" > cmVS11LibFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V110/1033/link.xml" > cmVS11LinkFlagTable.h Fix up the declaration names at the top of each file. Finally, teach cmVisualStudio10TargetGenerator to select the version of the table matching the version of VS.
| * | cmparseMSBuildXML: Include DisplayName in the outputZack Galbreath2012-08-221-11/+11
| |/
* | Merge topic 'VS10-PrecompiledHeader-default'David Cole2012-08-241-0/+1
|\ \ | | | | | | | | | | | | f0ae381 VS: Disable precompiled headers unless enabled by project (#12930)
| * | VS: Disable precompiled headers unless enabled by project (#12930)Brad King2012-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS 11 the WindowsAppContainer element enabled by the VS_WINRT_EXTENSIONS property activates precompiled header support automatically if no PrecompiledHeader setting is specified. For VS 10 and 11 set PrecompiledHeader to "NotUsing" explicitly by default unless overridden by a project-specified flag. Suggested-by: Eugene Golushkov <eugene_gff@ukr.net>
* | | Merge topic 'VS11-WinRT-project-issue-12930'David Cole2012-08-241-1/+2
|\ \ \ | |/ / | | | | | | | | | 4c9ae47 VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930)
| * | VS11: Rename 'Immersive' to 'WindowsAppContainer' (#12930)Brad King2012-08-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9e01aefd (VS: Add support for WinRT project properties, 2012-02-03) CMake generates for VS 11 projects the 'Immersive' element for the VS_WINRT_EXTENSIONS target property. That was based on the VS 11 preview version. The final version renamed the element to 'WindowsAppContainer', so generate that instead. Suggested-by: Eugene Golushkov <eugene_gff@ukr.net>
* | | Merge topic 'ninja-target-pdb-cleanup'David Cole2012-08-243-47/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 709fa59 Ninja: remove GetTargetPDB because it is used only once 4bb4787 Ninja:split out setting of msvc TARGET_PDB 59cbc28 Ninja: prepare msvc pdb cleanup
| * | | Ninja: remove GetTargetPDB because it is used only oncePeter Kümmel2012-08-222-17/+11
| | | |
| * | | Ninja:split out setting of msvc TARGET_PDBPeter Kümmel2012-08-223-25/+24
| | | |
| * | | Ninja: prepare msvc pdb cleanupPeter Kümmel2012-08-222-17/+19
| | | |
* | | | Merge topic 'compile-definitions-unique'David Cole2012-08-2411-91/+215
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0a1065 Rename files from main.cpp to more meaningful names. ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property 733deb6 Fix CompileDefinitions test on Visual Studio. 3dae652 Don't duplicate -D defines sent to the compiler.
| * | | | Rename files from main.cpp to more meaningful names.Stephen Kelly2012-08-225-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the main file for the dummy-executable and the actual compile test were both called main.cpp, they were overwriting each other during in-source builds.
| * | | | Fix the test setting COMPILE_DEFINITIONS target propertyStephen Kelly2012-08-211-1/+1
| | | | |
| * | | | Fix CompileDefinitions test on Visual Studio.Stephen Kelly2012-08-212-1/+10
| | | | | | | | | | | | | | | | | | | | Avoid testing unsupported spaces in define values.
| * | | | Don't duplicate -D defines sent to the compiler.Stephen Kelly2012-08-2011-91/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to do so. Be consistent with include directories and ensure uniqueness. This requires changing the API of the cmLocalGenerator::AppendDefines method, and changing the generators to match. The test unfortunately can't test for uniqueness, but it at least verifies that nothing gets lost.
* | | | | Merge topic 'topics/FindCUDA/Add-CUDA_SOURCE_PROPERTY_FORMAT'David Cole2012-08-241-19/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 787287c Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)
| * | | | | Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)James Bigler2012-08-201-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added CUDA_SOURCE_PROPERTY_FORMAT that allows users to set the format (OBJ or PTX) on a per file basis.
* | | | | | Merge topic 'pic-docs'David Cole2012-08-242-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c82fbe0 Fix unfortunate documentation error for PIC feature.
| * | | | | | Fix unfortunate documentation error for PIC feature.Stephen Kelly2012-08-202-2/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | The wrong variable is documented, and it is not referred to in the target-specific property.
* | | | | | Merge topic 'minor-docs-fixes'David Cole2012-08-243-7/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee949d8 Remove duplicate 'of' from docs. ecc1acb Remove incorrect doc string for link type enum 805f5e5 Fix some typos in the docs. 389d423 Add missing whitespace to docs.
| * | | | | | Remove duplicate 'of' from docs.Stephen Kelly2012-08-201-1/+1
| | | | | | |
| * | | | | | Remove incorrect doc string for link type enumStephen Kelly2012-08-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually a duplicate doc string for a method a few lines above.
| * | | | | | Fix some typos in the docs.Stephen Kelly2012-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/static the static/the static/ Make Visual Studio capitalized.
| * | | | | | Add missing whitespace to docs.Stephen Kelly2012-08-191-1/+1
| |/ / / / /
* | | | | | Merge topic 'DependencyScanning_13474'David Cole2012-08-244-19/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aed02a -fix Java dependency scanning, broken in previous commit 7ae4479 -fix line length 87fe428 fix #13474: also rescan dependencies if the depender does not exist
| * | | | | | -fix Java dependency scanning, broken in previous commitAlex Neundorf2012-08-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex