summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'target-LOCATION-policy'Brad King2013-10-1520-9/+152
|\ | | | | | | | | e4e5b28 cmTarget: Deprecate the LOCATION target property with a policy.
| * cmTarget: Deprecate the LOCATION target property with a policy.Stephen Kelly2013-10-1120-9/+152
| | | | | | | | | | | | | | | | | | | | | | | | The final location and name of a build-target is not determined until generate-time. However, reading the LOCATION property from a target is currently allowed at configure time. Apart from creating possibly-erroneous results, this has an impact on the implementation of cmake itself, and prevents some major cleanups from being made. Disallow reading LOCATION from build-targets with a policy. Port some existing uses of it in CMake itself to use the TARGET_FILE generator expression.
* | Merge topic 'FindCUDA-NPP-5.5'Brad King2013-10-151-1/+16
|\ \ | | | | | | | | | | | | 5076218 FindCUDA: Fix NPP library search for CUDA 5.5
| * | FindCUDA: Fix NPP library search for CUDA 5.5Vladislav Vinogradov2013-10-111-1/+16
| | | | | | | | | | | | In CUDA 5.5 NPP was divided onto 3 separate libraries: nppc, npps, nppi.
* | | Merge topic 'deprecate-COMPILE_FLAGS'Brad King2013-10-151-1/+4
|\ \ \ | | | | | | | | | | | | | | | | 3507d5a Deprecate COMPILE_FLAGS target property.
| * | | Deprecate COMPILE_FLAGS target property.Stephen Kelly2013-10-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | It is succeeded by COMPILE_OPTIONS, which supports generator expressions, is a list rather than a string, and is properly escaped.
* | | | Merge topic 'export-at-generate-time'Brad King2013-10-1513-111/+209
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4263c9 export(): Handle multiple dependent export sets. 66b290e export(): Process the export() command at generate time. 5fe5c32 export(): Set a Makefile on the cmExportBuildFileGenerator. e383555 cmExportInstallFileGenerator: Fix comment to match reality.
| * | | | export(): Handle multiple dependent export sets.Stephen Kelly2013-10-112-10/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The export-sets topic, merged in commit 49c7b649 (Merge topic 'export-sets', 2012-10-01) changed install(EXPORT) to allow exporting targets whose dependents are exported separately to different locations. Doing the same for export() was not possible because the export() command was executed at configure-time. Now that export() is also executed at generate-time, make it possible to export to multiple dependent export sets.
| * | | | export(): Process the export() command at generate time.Stephen Kelly2013-10-1112-83/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the API for adding targets string based so that it can easily use cmGeneratorTarget. Teach the cmIncludeCommand to generate the exported file at configure-time instead if it is to be include()d. The RunCMake.ExportWithoutLanguage test now needs a dummy header.h file as expected error from export() is now reported after the missing file error.
| * | | | export(): Set a Makefile on the cmExportBuildFileGenerator.Stephen Kelly2013-10-103-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is better than the cmCommand, because the lifetime of that is not as useful, and it is only used to report an error anyway. In the next commit, the cmExportBuildFileGenerator will outlive the cmCommand.
| * | | | cmExportInstallFileGenerator: Fix comment to match reality.Stephen Kelly2013-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | It was copied from cmExportBuildFileGenerator.
* | | | | Merge topic 'fix-CMP0024-multiple-directories'Brad King2013-10-1510-28/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | af1f698 CMP0024: Store the fact of included export in global generator.
| * | | | CMP0024: Store the fact of included export in global generator.Stephen Kelly2013-10-1010-28/+31
| | |_|/ | |/| | | | | | | | | | | | | | Storing it in the makefile means that the policy does not trigger when include and export are in differing directories.
* | | | Merge topic 'bump-required-cmake-version'Brad King2013-10-153-44/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 920ffbf Require CMake 2.8.4 or greater to build CMake
| * | | | Require CMake 2.8.4 or greater to build CMakeStephen Kelly2013-10-153-44/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the use of the $<TARGET_FILE:...> generator expression as a replacement for the use of the LOCATION target property. The use of the LOCATION target property is now deprecated for in-build targets. Also drop other checks for older CMake versions: * Simplify cmake_set_target_folder macro. * Use find_package(LibArchive) unconditionally. * Simplify condition for running testVisualStudioSlnParser test. * Convert two macros to functions. * Unconditionally run the CTestTestRerunFailed test.
* | | | | Merge topic 'osx-framework-search-flag'Brad King2013-10-155-13/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2e13c36 OS X: Encode -F framework search flag in per-language platform variable
| * | | | | OS X: Encode -F framework search flag in per-language platform variableBrad King2013-10-105-13/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers for languages other than C and C++ on OS X may not understand the -F framework search flag. Create a new platform information variable CMAKE_<LANG>_FRAMEWORK_SEARCH_FLAG to hold the flag, and set it for C and CXX lanugages in the Platform/Darwin module. Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | | | | Merge topic 'INTERFACE_LIBRARY-SYSTEM-header'Brad King2013-10-153-0/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 617ee7c Add a test for SYSTEM headers in INTERFACE libraries.
| * | | | | Add a test for SYSTEM headers in INTERFACE libraries.Stephen Kelly2013-10-093-0/+51
| | |/ / / | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-121-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-10-111-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2013-10-101-1/+1
|/ /
* | Merge topic 'xcode-5-no-BuildDepends-help'Brad King2013-10-091-1/+1
|\ \ | | | | | | | | | | | | 7f459a6 Xcode: Teach BuildDepends test that Xcode >= 5 needs no help
| * | Xcode: Teach BuildDepends test that Xcode >= 5 needs no helpBrad King2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | Drop the HELP_XCODE workarounds needed on older Xcode versions when using Xcode >= 5. We now expect builds and rebuilds to work using proper dependencies with no special help.
* | | Merge topic 'osx-cmake-app-info-plist'Brad King2013-10-093-3/+41
|\ \ \ | | | | | | | | | | | | | | | | dcf1b64 OS X: Set CMake.app bundle Info.plist fields (#11694)
| * | | OS X: Set CMake.app bundle Info.plist fields (#11694)Brad King2013-10-083-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Apple Info.plist reference documentation: Core Foundation Keys https://developer.apple.com/library/mac/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Launch Services Keys https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/LaunchServicesKeys.html Cocoa Keys https://developer.apple.com/library/mac/documentation/general/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html modify the Info.plist we create for cmake-gui to add/set fields CFBundleShortVersionString = The release-version-number string LSApplicationCategoryType = UTI that categorizes the app for the App Store NSHumanReadableCopyright = Specifies the copyright notice and drop fields CFBundleGetInfoString CFBundleLongVersionString LSRequiresCarbon Also prepare to set CFBundleVersion = The build-version-number string but leave it commented out as TBD (To Be Determined) for now. The version fields must have form <major>.<minor>.<patch> with integer components. While at it, rename the bundle to end in ".<patch>" instead of "-<patch>" so that it is consistent with the version number and does not look like a packaging increment suffix.
* | | | Merge topic 'deprecation-message'Brad King2013-10-0920-33/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f973737 GenerateExportHeader: Port to use message(DEPRECATION) f69606d Qt4Macros: Port to use message(DEPRECATION) 509c142 message: Add a DEPRECATION mode
| * | | | GenerateExportHeader: Port to use message(DEPRECATION)Stephen Kelly2013-10-081-9/+1
| | | | |
| * | | | Qt4Macros: Port to use message(DEPRECATION)Stephen Kelly2013-10-083-20/+4
| | | | |
| * | | | message: Add a DEPRECATION modeStephen Kelly2013-10-0816-4/+65
| | |/ / | |/| | | | | | | | | | | | | | | | | | By default, the message is not issued. If CMAKE_ERROR_DEPRECATED is on, the message is fatal. If CMAKE_WARN_DEPRECATED is on, the message is a warning.
* | | | Merge topic 'blas-windows'Brad King2013-10-092-57/+135
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 192a918 FindLAPACK: MKL clean up and fix for windows 46c7bca FindBLAS: Fixes for Windows MKL support
| * | | | FindLAPACK: MKL clean up and fix for windowsLeszek Swirski2013-10-081-45/+49
| | | | |
| * | | | FindBLAS: Fixes for Windows MKL supportLeszek Swirski2013-10-081-12/+86
| | | | |
* | | | | Merge topic 'FindGTK2-targets'Brad King2013-10-0949-98/+1303
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7efef02 FindGTK2: Add tests for components and targets in gtk and gtkmm modules 95fc47a FindGTK2: Make pangocairo and cairo optional dependencies 26f790f FindGTK2: Change extra includes -> optional 24e0272 FindGTK2: do not skip target creation if optional dependencies are not found d5f130c FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGET fffbd72 FindGTK2: Do not add freetype includes if they are not found b69720d FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when found 425ec40 FindGTK2: Do not link libfreetype e9f46df FindGTK2: Add config directories only if different from include ones 56a79e1 FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not empty 4b47586 FindGTK2: Add check to ensure that target exists 61242cc FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targets 4b876de FindGTK2: Link freetype libs to targets including freetype includes 67e761f FindGTK2: Small cleanup 682eea3 FindGTK2: Do not require the GTK_ prefix in all the internal functions 0bc3763 FindGTK2: Better handling of include directories ...
| * | | | | FindGTK2: Add tests for components and targets in gtk and gtkmm modulesDaniele E. Domenichelli2013-10-0848-0/+1031
| | | | | |
| * | | | | FindGTK2: Make pangocairo and cairo optional dependenciesDaniele E. Domenichelli2013-10-081-12/+14
| | | | | |
| * | | | | FindGTK2: Change extra includes -> optionalDaniele E. Domenichelli2013-10-081-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | On some versions they are not required.
| * | | | | FindGTK2: do not skip target creation if optional dependencies are not foundDaniele E. Domenichelli2013-10-081-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | On some older GTK2 version gio, giomm and cairomm are not available
| * | | | | FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGETDaniele E. Domenichelli2013-10-081-152/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function avoids creating the targets when the required dependencies were not found. Also fix some wrong dependency and some typo. ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} are now required for gtkmm component
| * | | | | FindGTK2: Do not add freetype includes if they are not foundDaniele E. Domenichelli2013-10-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | On some older system they are not required
| * | | | | FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when foundDaniele E. Domenichelli2013-10-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libraries (e.g. gio) are not necessary, and often not available with older GTK2 versions, therefore GTK_LIBRARIES should not contain GTK2_XXX-NOT_FOUND for these libraries.
| * | | | | FindGTK2: Do not link libfreetypeDaniele E. Domenichelli2013-10-081-34/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on the mailing list, freetype includes used in GTK2 headers libraries do not require to link the library explicitly (even though it is already linked by GTK2 libraries. Also remove _GTK2_ADD_TARGET_LIBRARIES no longer used and use ${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2} variables instead of ${FREETYPE_INCLUDE_DIRS}
| * | | | | FindGTK2: Add config directories only if different from include onesDaniele E. Domenichelli2013-10-081-1/+1
| | | | | |
| * | | | | FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if not emptyDaniele E. Domenichelli2013-10-081-1/+3
| | | | | |
| * | | | | FindGTK2: Add check to ensure that target existsDaniele E. Domenichelli2013-10-081-5/+7
| | | | | |
| * | | | | FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targetsDaniele E. Domenichelli2013-10-081-3/+8
| | | | | |
| * | | | | FindGTK2: Link freetype libs to targets including freetype includesDaniele E. Domenichelli2013-10-081-0/+21
| | | | | |
generated by cgit v0.12 at 2024-10-20 13:02:40 (GMT)