summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-306-0/+21
| | | | Also add a 'CMAKE_ANDROID_API' variable to set the property default.
* Add 'ANDROID_GUI' target property to mark Android applicationsBrad King2014-09-295-2/+30
| | | | | | | 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: Detect compiler id of Nsight Tegra-Android toolchainsBrad King2014-09-293-5/+76
| | | | | | | | | | Teach CMakeDetermineCompilerId to recognize the Tegra-Android platform and generate a test project for Nsight Tegra tools. Locate the full path to CMAKE_<LANG>_COMPILER by computing it within the test project build environment. Also teach CMakeFindBinUtils that this variant of the Visual Studio generator uses UNIX-like instead of MS-like archiving and linking tools.
* VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'Brad King2014-09-294-0/+55
| | | | | | | 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.
* 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.
* Tests: Always detect VS and SDK availability on WindowsBrad King2014-09-291-14/+17
| | | | | Move the detection block out of the Windows >= 8 conditional so it can be used on other versions.
* Merge topic 'vs10-wince'Brad King2014-09-163-3/+72
|\ | | | | | | | | a3298f77 VS: Teach VS >= 10 generator about Windows CE
| * VS: Teach VS >= 10 generator about Windows CEPascal Bach2014-09-153-3/+72
| | | | | | | | | | | | | | | | When CMAKE_SYSTEM_NAME is 'WindowsCE': * Set the Subsystem and EntryPointSymbol accordingly. * When CMAKE_SYSTEM_VERSION is 8.0 (Windows CE 2013), select the CE800 toolset by default.
* | CMake Nightly Date StampKitware Robot2014-09-161-1/+1
|/
* Merge topic 'doc-set_test_properties-example'Brad King2014-09-151-1/+1
|\ | | | | | | | | d8054987 Help: Fix set_tests_properties documentation typo
| * Help: Fix set_tests_properties documentation typoAndrew Bauer2014-09-121-1/+1
| | | | | | | | The example for FAIL_REGULAR_EXPRESSION should actually name it.
* | Merge topic 'vs-generator-platform'Brad King2014-09-1528-14/+111
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | be6a555d Tests: Test setting a generator platform in a toolchain file d506fee8 Tests: Use -A option to pass generator platform selection 11c9ddd6 ExternalProject: Use -A option to pass generator platform 29bd843e CTest: Use -A option to pass generator platform selection eb7d8156 cmake: Add -A option to specify a generator platform
| * | Tests: Test setting a generator platform in a toolchain fileBrad King2014-09-159-0/+50
| | | | | | | | | | | | | | | Teach the RunCMake.GeneratorPlatform test to cover setting CMAKE_GENERATOR_PLATFORM in a file loaded by CMAKE_TOOLCHAIN_FILE.
| * | Tests: Use -A option to pass generator platform selectionBrad King2014-09-157-8/+8
| | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * | ExternalProject: Use -A option to pass generator platformBrad King2014-09-151-2/+2
| | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * | CTest: Use -A option to pass generator platform selectionBrad King2014-09-152-2/+2
| | | | | | | | | | | | This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
| * | cmake: Add -A option to specify a generator platformBrad King2014-09-1510-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the 'cmake -A' option to set CMAKE_GENERATOR_PLATFORM without having to spell out the whole variable name. We choose the name '-A' for "platform" because '-P' is already taken, and in the common use case the "platform" is actually an architecture (e.g. x64). Teach the RunCMake test infrastructure to use -A to pass the generator platform. Extend the RunCMake.GeneratorPlatform test with a case to verify that the -A option cannot be repeated.
* | | Merge topic 'if-sanity'Brad King2014-09-1555-742/+1578
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 858d5a0b Fix if() checks of CMAKE_SYSTEM_NAME on Cygwin e177e7af FPHSA: Avoid if() dereferencing of quoted variable 425acc52 cmcurl: Use if(DEFINED) to simplify conditions cede5cbd libarchive: Avoid depending on if() to dereference a quoted variable 2d97178b FindGTK2: Avoid depending on if() to dereference a quoted variable 0b12815d Modules/Test*.cmake: Use if(DEFINED) to simplify conditions 188a1f23 If: Introduce policy CMP0054 - don't dereference quoted variables in if() b900c1cc If: Extract cmConditionEvaluator from if() implementation
| * | | Fix if() checks of CMAKE_SYSTEM_NAME on CygwinBrad King2014-09-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_SYSTEM_NAME is "CYGWIN", but we also define a variable named "CYGWIN" to "1". Avoid allowing if() to expand the "CYGWIN" string as a variable.
| * | | FPHSA: Avoid if() dereferencing of quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy invocations may pass a variable name where "DEFAULT_MSG" belongs. When comparing FPHSA_FAIL_MESSAGE to "DEFAULT_MSG", use a leading "x" on both sides to avoid mistaking the value of the message for a variable name.
| * | | cmcurl: Use if(DEFINED) to simplify conditionsBrad King2014-09-112-4/+4
| | | | | | | | | | | | | | | | | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
| * | | libarchive: Avoid depending on if() to dereference a quoted variableBrad King2014-09-111-2/+2
| | | |
| * | | FindGTK2: Avoid depending on if() to dereference a quoted variableBrad King2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Explicitly dereference GTK2_${_var}CONFIG_INCLUDE_DIR and GTK2_${_var}_INCLUDE_DIR when comparing their values.
| * | | Modules/Test*.cmake: Use if(DEFINED) to simplify conditionsBrad King2014-09-114-4/+4
| | | | | | | | | | | | | | | | | | | | Replace old hacks of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'.
| * | | If: Introduce policy CMP0054 - don't dereference quoted variables in if()Nils Gladitz2014-09-1142-93/+846
| | | |
| * | | If: Extract cmConditionEvaluator from if() implementationNils Gladitz2014-09-116-720/+803
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-131-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-09-121-1/+1
| |_|/ |/| |
* | | Merge topic 'doc-check-results-cached'Brad King2014-09-1116-1/+18
|\ \ \ | | | | | | | | | | | | | | | | 908c7439 Help: Document that the CHECK_* macros create cache variables
| * | | Help: Document that the CHECK_* macros create cache variablesSebastian Leske2014-09-1116-1/+18
| | | | | | | | | | | | | | | | Otherwise callers may expect to be able to re-use result variables.
* | | | Merge topic 'doc-WINCE-var'Brad King2014-09-112-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4b4555de Help: Document the WINCE variable
| * | | | Help: Document the WINCE variablePascal Bach2014-09-112-0/+6
| |/ / /
* | | | Merge topic 'fix-gnu-hurd-host-detection'Brad King2014-09-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 89d7a5a4 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
| * | | | Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)Felix Geyer2014-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m' instead.
* | | | | Merge branch 'release'Brad King2014-09-110-0/+0
|\ \ \ \ \
| * | | | | CMake 3.0.2v3.0.2Brad King2014-09-081-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-09-111-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'vs-generator-platform'Brad King2014-09-1079-86/+438
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * | | | enable_language: Initialize system-specific generator info only onceBrad King2014-09-101-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset exactly once after reading CMakeSystem.cmake, and not again on another call to enable_language() or project().
| * | | | Tests: Add generator platform supportBrad King2014-09-1042-7/+68
| | | | | | | | | | | | | | | | | | | | | | | | | Propagate CMAKE_GENERATOR_PLATFORM through the test hierarchy so that all tests can build with the selected generator platform, if any.
| * | | | ExternalProject: Propagate the generator platformBrad King2014-09-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the CMAKE_GENERATOR option is given to ExternalProject_Add, look also for option CMAKE_GENERATOR_PLATFORM to pass on to cmake as a cache definition. When no CMAKE_GENERATOR option is given explicitly then use the current project's CMAKE_GENERATOR_PLATFORM (since we already use its CMAKE_GENERATOR).
| * | | | CTest: Add options to set generator platformBrad King2014-09-055-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ctest_configure command already reads the CTEST_CMAKE_GENERATOR variable to get the value for the cmake -G option. Read new variable CTEST_CMAKE_GENERATOR_PLATFORM to pass on as CMAKE_GENERATOR_PLATFORM. The "ctest --build-and-test" mode already has "--build-generator" to specify the -G option to CMake. Add a "--build-generator-platform" option to specify a value to pass on as CMAKE_GENERATOR_PLATFORM.
| * | | | VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8Brad King2014-09-0516-31/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VS generator names that do not specify the platform name, read CMAKE_GENERATOR_PLATFORM to get it. Extend the RunCMake.GeneratorPlatform test with a case covering use of the x64 platform when the test generator is a Visual Studio generator whose name does not specify a platform.
| * | | | CMake: Add CMAKE_GENERATOR_PLATFORM optionBrad King2014-09-0516-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject the option by default. It will be implemented on a per-generator basis. Pass the setting into try_compile project generation. Add cache entry CMAKE_GENERATOR_PLATFORM and associated variable documentation to hold the value persistently. Add a RunCMake.GeneratorPlatform test to cover basic use cases for the option. Verify that CMAKE_GENERATOR_PLATFORM is empty by default, and that it is rejected when the generator does not support a user setting.