summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FPHSA: when EXACT version match is requested only compare the components givenRolf Eike Beer2014-10-0722-4/+77
| | | | | | | | | Given that you have a foobar that identifies itself as 1.2.3 from now on a find_package(foobar 1.2 EXACT) will succeed, as 1.2.3 will now be considered as being 1.2. Until now this was only the case for version 1.2.0.
* CMake Nightly Date StampKitware Robot2014-10-031-1/+1
|
* CMake Nightly Date StampKitware Robot2014-10-021-1/+1
|
* CMake Nightly Date StampKitware Robot2014-10-011-1/+1
|
* Merge topic 'cleanup-CMP0054'Brad King2014-09-301-7/+7
|\ | | | | | | | | 69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference
| * GenerateExportHeader: Avoid if() quoted auto-dereferenceBrad King2014-09-291-7/+7
| | | | | | | | | | | | When testing CMAKE_CXX_COMPILER_ID values with if(MATCHES), do not explicitly dereference or quote CMAKE_CXX_COMPILER_ID. We want if() to auto-dereference the variable and not its value.
* | Merge topic 'build_cmake_dmg_non_universal'Brad King2014-09-301-1/+1
|\ \ | | | | | | | | | | | | 3da328d3 Make the OSX 10.6+ release x86_64 only.
| * | Make the OSX 10.6+ release x86_64 only.Robert Maynard2014-09-291-1/+1
| |/ | | | | | | | | We have no need for the 10.6+ bundle to be 32 and 64bit. For older 32bit machines they should be using the 10.4+ 32bit release.
* | Merge topic 'GNUInstallDirs-typo'Brad King2014-09-301-2/+2
|\ \ | | | | | | | | | | | | 33f03129 Fix typo in Modules/GNUInstallDirs.cmake (#15176)
| * | Fix typo in Modules/GNUInstallDirs.cmake (#15176)David Coppa2014-09-291-2/+2
| |/ | | | | | | | | Commit d4fdd9c189f85d659f4294f8ec6da3e7e51215ec ("GNUInstallDirs: use the proper default for info and man paths on OpenBSD") introduced a typo.
* | Merge topic 'vs-nsight-tegra-generator'Brad King2014-09-3027-11/+567
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'
| * | Help: Add notes for topic 'vs-nsight-tegra-generator'Brad King2014-09-301-0/+8
| | |
| * | 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: Fix Tegra-Android platform linking of libraries by nameBrad King2014-09-302-0/+7
| | | | | | | | | | | | | | | | | | | | | Nsight Tegra Visual Studio Edition handles prefixing of library names with '-l' automatically, so teach the generator not to do so. Reported-by: Mourad Boufarguine <mourad@boufarguine.name>
| * | Tests: Add test for VS Nsight Tegra generator supportBrad King2014-09-309-1/+206
| | | | | | | | | | | | | | | | | | | | | | | | Create a VSNsightTegra test based on the "two-libs" example from the Android NDK. Add it whenever testing on a machine with VS 11 or 12 and the NVIDIA Nsight Tegra Visual Studio Edition installed. Exclude it when there is a space in the path to the source or build tree because the tools do not seem to support it.
| * | 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.
* | | CMake Nightly Date StampKitware Robot2014-09-301-1/+1
| | |
* | | Merge topic 'vs-minor-cleanups'Brad King2014-09-292-15/+22
|\ \ \ | |/ / | | / | |/ |/| | | | | 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.
| * 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 'wix-directory-permissions'Brad King2014-09-296-6/+49
|\ \ | | | | | | | | | | | | d48c781f CPackWiX: Extend CPACK_WIX_ACL to support directories
| * | CPackWiX: Extend CPACK_WIX_ACL to support directoriesNils Gladitz2014-09-276-6/+49
| | |
* | | 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
| |\ \ \
| | * | | KWSys 2014-09-25 (29ffaf43)KWSys Robot2014-09-263-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43 Brad King (1): 29ffaf43 Suppress deprecation warnings for GetVersionEx Sean McBride (1): 6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
* | | | | Merge topic 'fix-test-FailedSubmit-match'Brad King2014-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e0acdd1a Tests: Adjust expected error message in FailedSubmit-ftp
| * | | | | Tests: Adjust expected error message in FailedSubmit-ftpTony Kelman2014-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error message from cygwin's curl (using `--system-libs`) in CTestTestFailedSubmit-ftp was: Failed to connect to port 21: Connection timed out ^^^ Update our regex to match this.
* | | | | | Merge topic 'build_cmake_dmg_with_bzip'Brad King2014-09-292-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffa5db96 CMake now using bzip2 compression for mac release bundles.
| * | | | | | CMake now using bzip2 compression for mac release bundles.Robert Maynard2014-09-242-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with OSX 10.4 dmg files offers bzip2 compression which offers small package sizes.
* | | | | | | Merge topic 'remove-old-DartLocal.conf'Brad King2014-09-292-125/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a5d9256 Remove unused legacy 'DartLocal.conf' file
| * | | | | | | Remove unused legacy 'DartLocal.conf' fileBrad King2014-09-242-125/+0
| |/ / / / / /
* | | | | | | Merge topic 'FindCUDA-cleanup-CMP0054'Brad King2014-09-292-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84e3fde9 FindCUDA: Avoid if() auto-dereference in string comparisons
| * | | | | | | FindCUDA: Avoid if() auto-dereference in string comparisonsAdam Strzelecki2014-09-242-8/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This silences possible CMP0054 warnings.
* | | | | | | 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
| | | | |
generated by cgit v0.12 at 2024-11-15 09:15:22 (GMT)