summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-clang-cross-compile-find-binutils'Brad King2014-09-082-2/+6
|\ | | | | | | | | 72d66818 Fix finding binutils when cross-compiling with Clang
| * Fix finding binutils when cross-compiling with ClangBrad King2014-09-052-2/+6
| | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options, 2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix when cross-compiling with Clang. Fix the implementation to use the compiler target as the prefix only when it is set. Otherwise toolchain files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use a prefix of just "-" and of course cannot find "-ar" or "-ld".
* | CMake Nightly Date StampKitware Robot2014-09-081-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-09-071-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-09-061-1/+1
| |
* | 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
| * | | | | | | | | VS: Add test case for Windows Phone and Windows StoreGilles Khouzam2014-09-0231-0/+1387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests to build for each version of each system when the corresponding tools are available.
| * | | | | | | | | MSVC: Define 'WIN32' for Windows Store and Windows PhoneGilles Khouzam2014-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally left out of commit c72f0887 (MSVC: Add default WindowsPhone and WindowsStore compile flags, 2014-07-28).
| * | | | | | | | | Help: Add notes for topic 'vs-windows-apps'Brad King2014-09-021-0/+6
| | | | | | | | | |
| * | | | | | | | | VS: Do not compile C sources as WinRT (#15100)Brad King2014-09-023-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSVC /ZW flag is valid only for C++ sources. Whenever we enable CompileAsWinRT for the whole target, disable it for all C sources. Update the documentation of VS_WINRT_COMPONENT to drop the statement about undefined behavior for non-C++ sources, because it is now defined as expected.
| * | | | | | | | | VS: Mark Windows Phone and Store targets as App ContainersGilles Khouzam2014-09-029-3/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add AppContainerApplication to non-UTILITY targets * Generate app manifest and related files if project does not provide them. Place them in a per-target directory to avoid clashes. * Mark WinRT components with WinMDAssembly * Import Windows Phone 8.0 targets in .vcxproj files when necessary, and reference platform.winmd. Inspired-by: Paul Annetts <paul@lightunobscured.com>
| * | | | | | | | | VS: Always ignore ole32 on Windows Phone 8.0Gilles Khouzam2014-08-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Paul Annetts <paul@lightunobscured.com>
generated by cgit v0.12 at 2025-01-21 09:03:02 (GMT)