summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmake-gui: Make sure we bundle Qt5 Cocoa platform pluginAdam Strzelecki2014-10-101-1/+27
| | | | Otherwise CMake.app bundle will not run when using Qt5.
* Merge topic 'vs-nsight-tegra-generator'Brad King2014-09-306-5/+232
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df84281d Help: Add notes for topic 'vs-nsight-tegra-generator' 69e198dc VS: Generate Nsight Tegra project revision number 5365c9ac VS: Map Nsight Tegra file types in .vcxproj files 178f56a5 VS: Fix Tegra-Android platform linking of libraries by name 7115702f Tests: Add test for VS Nsight Tegra generator support a6289499 VS: Generate ANDROID_GUI executables as app packages c12e4699 Add 'ANDROID_API' target property to set Android Target API 9a4df52a Add 'ANDROID_GUI' target property to mark Android applications 16569abf cmTarget: Track internally whether platform is Android ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains 2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
| * VS: Generate Nsight Tegra project revision numberBrad King2014-09-304-3/+34
| | | | | | | | | | | | Nsight Tegra 2.0 will be revision '8'. Generate this revision number and add a NsightTegraUpgradeOnceWithoutPrompt element to tell newer versions not to prompt when upgrading the generated project file.
| * VS: Map Nsight Tegra file types in .vcxproj filesBrad King2014-09-301-1/+23
| | | | | | | | | | | | | | Map ".java" to JCompile, ".asm" and ".s" to ClCompile, and a few Android-specific source file names to AndroidBuild. This allows Nsight Tegra 1.6 and above to check up-to-dateness of such sources. Bump NsightTegraProjectRevisionNumber to 7 to allow these fields.
| * VS: Generate ANDROID_GUI executables as app packagesBrad King2014-09-302-1/+53
| | | | | | | | | | | | When an executable is marked with ANDROID_GUI, generate an AntBuild step in the .vcxproj file and point it at the directory found to contain AndroidManifest.xml. Assume it also contains build.xml.
| * Add 'ANDROID_API' target property to set Android Target APIBrad King2014-09-302-0/+7
| | | | | | | | Also add a 'CMAKE_ANDROID_API' variable to set the property default.
| * Add 'ANDROID_GUI' target property to mark Android applicationsBrad King2014-09-291-2/+14
| | | | | | | | | | | | | | Also add a 'CMAKE_ANDROID_GUI' variable to set the property default so a project can easily make all executables Android applications. An Android application executable file has the same extension as a shared library (.so).
| * cmTarget: Track internally whether platform is AndroidBrad King2014-09-292-0/+7
| | | | | | | | Add an IsAndroid member to save whether CMAKE_SYSTEM_NAME is "Android".
| * VS: Teach vcxproj generation about the Tegra-Android platformBrad King2014-09-292-3/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complete the basic implementation of the VS Tegra-Android generators by replacing parts of vcxproj files that are specific to MS tools with settings defined for the NVIDIA Nsight Tegra tools. Current limitations include: * We have no "flag table" so flags will be passed in the additional options fields instead of mapped to the vcxproj elements defined by Nsight Tegra msbuild platform definition files. * We have no interface to set the AndroidArch, AndroidStlType, or AndroidTargetAPI fields so defaults will be used. * The Nsight Tegra msbuild platform definition files do not provide a working "Utility" target type so for add_custom_target we need to use a "StaticLibrary" target type and leave out ClCompile rules. * There is also no target type for plain command-line executables so for add_executable we need to use a "DynamicLibrary" target. Full application bundles will likely require new CMake target properties (like WIN32_EXECUTABLE for Windows GUI executables).
| * VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'Brad King2014-09-292-0/+47
| | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is 'Android', check for an installation of 'NVIDIA Nsight Tegra Visual Studio Edition' and generate .vcxproj files for the "Tegra-Android" platform. Also make the installed version available in a CMAKE_VS_NsightTegra_VERSION variable.
* | CMake Nightly Date StampKitware Robot2014-09-301-1/+1
| |
* | Merge topic 'vs-minor-cleanups'Brad King2014-09-291-1/+5
|\ \ | |/ | | | | | | | | | | c655f0c4 VS: Drop GenerateManifest from .vcxproj files for non-MS tools 227a3367 VS: Use case-insensitive check for hlsl,jpg,png,xml file extensions 4a24015a Tests: Always detect VS and SDK availability on Windows
| * VS: Drop GenerateManifest from .vcxproj files for non-MS toolsBrad King2014-09-291-0/+4
| | | | | | | | | | The .vcxproj file content generated by OutputLinkIncremental is specific to MS tools, so drop it when using other tools.
| * VS: Use case-insensitive check for hlsl,jpg,png,xml file extensionsBrad King2014-09-291-1/+1
| | | | | | | | | | These "extra" sources should map to the proper tool even when they are not in lower case.
* | Merge topic 'wix-directory-permissions'Brad King2014-09-295-5/+47
|\ \ | | | | | | | | | | | | d48c781f CPackWiX: Extend CPACK_WIX_ACL to support directories
| * | CPackWiX: Extend CPACK_WIX_ACL to support directoriesNils Gladitz2014-09-275-5/+47
| | |
* | | Merge topic 'update-kwsys'Brad King2014-09-293-1/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | 20853009 Merge branch 'upstream-kwsys' into update-kwsys a79ff0e4 KWSys 2014-09-25 (29ffaf43)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-263-1/+38
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-281-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2014-09-271-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2014-09-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-09-251-1/+1
| |
* | Merge topic 'fix_search_path_ios_trycompile'Brad King2014-09-241-0/+4
|\ \ | | | | | | | | | | | | 55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
| * | Teach try_compile COPY_FILE to look for IOS app bundles.Bill Hoffman2014-09-231-0/+4
| | | | | | | | | | | | | | | The COPY_FILE option on try_compile never looked for IOS application bundles. This caused it to fail if the CMAKE_MACOSX_BUNDLE was set.
* | | Merge topic 'vs-wince-exe-entry-point'Brad King2014-09-241-2/+8
|\ \ \ | | | | | | | | | | | | | | | | e7aeb79f VS, WINCE: Only set EntryPointSymbol for executables
| * | | VS, WINCE: Only set EntryPointSymbol for executablesPascal Bach2014-09-221-2/+8
| | | |
* | | | Merge topic 'fix-LOCATION-slashes'Brad King2014-09-241-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 92b2c618 Remove extra slashes from LOCATION target property value
| * | | | Remove extra slashes from LOCATION target property valueBrad King2014-09-221-5/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~429^2~2 (Remove the Location member from cmTarget, 2012-10-07) a few extra slashes were added to the path construction logic, perhaps due to a partially implemented attempt at handling the case that GetDirectory returns an empty string. This leads to LOCATION paths with double slashes in some cases. Remove them now.
* | | | Merge topic 'ninja-compiler-change'Brad King2014-09-241-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6120fca8 Ninja: Prevent compilers to be silently modified
| * | | | Ninja: Prevent compilers to be silently modifiedSylvain Joubert2014-09-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike with Unix Makefiles generator modifying compiler paths was not protected with Ninja generator. It was possible to modify them in the cache without the expected effect on the generated solution. Also activate corresponding tests with Ninja.
* | | | | CMake Nightly Date StampKitware Robot2014-09-241-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-09-231-1/+1
| |/ / |/| |
* | | Merge topic 'wix-remember-install-dir'Brad King2014-09-221-0/+23
|\ \ \ | | | | | | | | | | | | | | | | e785fab5 CPackWiX: Teach WiX installers to remember the install location for upgrades
| * | | CPackWiX: Teach WiX installers to remember the install location for upgradesNils Gladitz2014-09-191-0/+23
| |/ /
* | | Merge topic 'vs-windows-store-certifictes'Brad King2014-09-221-0/+4
|\ \ \ | | | | | | | | | | | | | | | | d4ca8fb2 VS: Add Certificates to .vcxproj files
| * | | VS: Add Certificates to .vcxproj filesGilles Khouzam2014-09-191-0/+4
| |/ / | | | | | | | | | | | | | | | After certificates were moved into their own category in cmGeneratorTarget, that category was not added for output by the VS 10 generator. Add it now.
* | | Merge topic 'fix-enable_language-missing-module-errors'Brad King2014-09-221-6/+6
|\ \ \ | | | | | | | | | | | | | | | | 1b549a5c enable_language: Fix error messages on missing modules (#15155)
| * | | enable_language: Fix error messages on missing modules (#15155)Brad King2014-09-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalGenerator::EnableLanguage, fix error messages for missing module files to actually name the missing module instead of using the empty string returned by GetModulesFile.
* | | | Merge topic 'autogen-fixes'Brad King2014-09-222-31/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e3c97a19 QtAutogen: Process all ui files in a source file (#14981). b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
| * | | | QtAutogen: Process all ui files in a source file (#14981).Stephen Kelly2014-09-182-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Use a vector to store a list of matched ui_ includes, instead of overwriting the previous match.
| * | | | QtAutogen: Add source files to target when only AUTORCC is used.Stephen Kelly2014-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | Add missing entry to if condition.
* | | | | Merge topic 'minor-cleanups'Brad King2014-09-222-9/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bda168 Simplify use of binary_search. 1927e4ba Remove const char string comparison helper.
| * | | | | Simplify use of binary_search.Stephen Kelly2014-09-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A local string was created when dir was a const char*. Now dir is a std::string already so the dirString is vestigal.
| * | | | | Remove const char string comparison helper.Stephen Kelly2014-09-171-6/+0
| | |_|_|/ | |/| | | | | | | | | | | | | It is now unused.
* | | | | CMake Nightly Date StampKitware Robot2014-09-221-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-09-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-09-201-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-09-191-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2014-09-181-1/+1
| | |