summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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.
* Help: Document CMAKE_VS_PLATFORM_NAME variableBrad King2014-09-052-0/+8
|
* VS: Refactor internal default platform name selectionBrad King2014-09-053-7/+13
| | | | | | Rename the 'PlatformName' member to 'DefaultPlatformName' and make sure it is only read through a 'GetPlatformName()' call. This will allow non-default names to be chosen later.
* cmGlobalVisualStudio10Generator: Re-order some methodsBrad King2014-09-052-14/+14
| | | | | Order SetSystemName and SetGeneratorToolset method declarations and definitions as they are called.
* cmGlobalGenerator: Call SetGeneratorToolset even for empty toolsetBrad King2014-09-054-26/+26
| | | | | | Move handling of an empty toolset name into the implementation of the method. This simplifies the VS 10 implementation of default toolset selection because it has one code path that is always called.
* CMake Nightly Date StampKitware Robot2014-09-051-1/+1
|
* Merge topic 'fix-gtk2-missing-optional-includes'Brad King2014-09-041-1/+5
|\ | | | | | | | | cb8f0f7c FindGTK2: Fix missing optional include dirs.
| * FindGTK2: Fix missing optional include dirs.Chuck Atkins2014-09-041-1/+5
| | | | | | | | | | | | | | | | | | FindGTK2 was adding optional include directories to the interface include dirs regardless of whether or not they existed. This ensures that the directories only get added if they are actually found. This is particularly a problem on Solaris where the gtk2 libs and headers might exist but the FreeType2 headers might not.
* | Merge branch 'release'Brad King2014-09-040-0/+0
|\ \
| * \ Merge branch 'backport-xcode-duplicate-file-refs' into releaseBrad King2014-09-031-6/+4
| |\ \
* | \ \ Merge topic 'doc-add_custom_command-multiple-commands'Brad King2014-09-041-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 412926d0 Help: Clarify add_custom_command multiple command behavior (#15112)
| * | | | Help: Clarify add_custom_command multiple command behavior (#15112)Brad King2014-09-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Explicitly say that the commands are not composed into a stateful script.
* | | | | Merge topic 'doc-try_compile-debug-advice'Brad King2014-09-041-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | abbe91c5 Help: Clarify --debug-trycompile usage with try_compile
| * | | | | Help: Clarify --debug-trycompile usage with try_compileAlan W. Irwin2014-09-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that try_compile calls need to be protected with conditions to avoid running more than once so that it is easy to isolate a single try_compile to perform with --debug-trycompile.
* | | | | | Merge topic 'xcode-duplicate-file-refs'Brad King2014-09-041-6/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d73f8828 Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs cf92fe2d Xcode: Generate per-target file references (#15111) e7114226 Xcode: Generate per-target file references (#15111)
| * \ \ \ \ \ Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refsBrad King2014-09-030-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our side.
| | * | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
| * | | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
* | | | | | Merge topic 'xcode-assetcatalog-folder-type'Brad King2014-09-041-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eacc339 Xcode: Reference '.xcassets' folders as assetcatalog (#15125) 02aa5965 Xcode: Refactor internal file type extension extraction
| * | | | | | Xcode: Reference '.xcassets' folders as assetcatalog (#15125)Brad King2014-09-031-1/+1
| | | | | | |
| * | | | | | Xcode: Refactor internal file type extension extractionBrad King2014-09-031-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Move it earlier so it can be used for directories too.
* | | | | | Merge topic 'bash-complete-ctest-labels'Brad King2014-09-041-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2603e128 bash-completion: Complete 'ctest' label names
| * | | | | | bash-completion: Complete 'ctest' label namesSylvain Joubert2014-09-031-2/+6
| |/ / / / /
* | | | | | Merge topic 'InstallRequiredSystemLibraries-vs-openmp'Brad King2014-09-042-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d538c55e Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp' bdb5007b InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)
| * | | | | | Help: Add notes for topic 'InstallRequiredSystemLibraries-vs-openmp'Brad King2014-09-041-0/+6
| | | | | | |
| * | | | | | InstallRequiredSystemLibraries: Install OpenMP runtime libs (#15117)Gregory Sharp2014-09-021-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option CMAKE_INSTALL_OPENMP_LIBRARIES to control the behavior.
* | | | | | | Merge topic 'vim-syntax'Brad King2014-09-041-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce540aea cmake-syntax.vim: Update the command list
| * | | | | | | cmake-syntax.vim: Update the command listLukáš Lalinský2014-09-041-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'wix-log-on-failure'Brad King2014-09-041-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4952030c CPackWiX: Attach wix.log on test failure.
| * | | | | | | CPackWiX: Attach wix.log on test failure.Nils Gladitz2014-09-021-0/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-09-041-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-09-031-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'fix-liblzma-build-on-solaris-suncc'Brad King2014-09-021-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c16d8c7f liblzma: Added a missing config check for _Bool
| * | | | | liblzma: Added a missing config check for _BoolChuck Atkins2014-09-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a current build problem for liblzma on Solaris 10, SPARC, and the Solaris Studio compiler.
* | | | | | Merge topic 'ctest-help-fix'Brad King2014-09-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6767660f CTest: Add missing space in command line help.
| * | | | | | CTest: Add missing space in command line help.Nils Gladitz2014-09-011-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'fix-findpostgres-for-multilib'Brad King2014-09-021-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 741f29cc FindPostgreSQL: Fix for pg_config in multilib configurations.
| * | | | | | FindPostgreSQL: Fix for pg_config in multilib configurations.Chuck Atkins2014-09-021-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some platforms, Fedora 20 and RHEL 7 in particular, will have multiple pg_config_${arch}.h files all included by the top level pg_config.h. This checks all of the available pg_config*.h headers for version information.
* | | | | | | Merge topic 'string-uuid'Brad King2014-09-0227-0/+483
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87e476e8 Help: Add notes for topic 'string-uuid' 328e8694 StringUuid: Implement new string(UUID) sub-command.
| * | | | | | | Help: Add notes for topic 'string-uuid'Brad King2014-09-021-0/+5
| | | | | | | |
| * | | | | | | StringUuid: Implement new string(UUID) sub-command.Nils Gladitz2014-08-2826-0/+478
| | | | | | | |
* | | | | | | | Merge topic 'asm-user-override-files'Brad King2014-09-021-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 487f147f Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)
| * | | | | | | | Load CMAKE_USER_MAKE_RULES_OVERRIDE[_ASM] for assembler (#15108)Mikhail Nikonov2014-08-271-0/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is already done for C, CXX, and Fortran.
* | | | | | | | Merge topic 'vs-windows-apps'Brad King2014-09-0250-19/+2121
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39fefde2 VS: Add test case for Windows Phone and Windows Store 89da8465 MSVC: Define 'WIN32' for Windows Store and Windows Phone ed7f085f Help: Add notes for topic 'vs-windows-apps' dd11ae8f VS: Do not compile C sources as WinRT (#15100) b8e40538 VS: Mark Windows Phone and Store targets as App Containers 0432f062 VS: Always ignore ole32 on Windows Phone 8.0 e6ff2f8b VS: Generate Windows Metadata for WinRT components ee48f4c7 VS: Generate Windows Phone and Windows Store projects as Unicode cb1aceed VS: Add VS_WINRT_COMPONENT property to enable CompileAsWinRT 401269e4 VS: Handle .pfx files explicitly in generator 23782171 VS: Handle AppxManifest sources explicitly in generator bc373c6d VS: Set Window Phone/Store app type in CMake-generated targets d89b2889 VS: Mark CMake-generated targets as Utility in .vcxproj files 03ad8f28 CMakeDetermineCompilerABI: Link with standard libraries on MSVC
generated by cgit v0.12 at 2025-02-23 08:21:53 (GMT)