summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | |
| * | | | FindGTK2: Small cleanupDaniele E. Domenichelli2013-10-081-1/+0
| | | | |
| * | | | FindGTK2: Do not require the GTK_ prefix in all the internal functionsDaniele E. Domenichelli2013-10-081-146/+148
| | | | | | | | | | | | | | | | | | | | This saves from using string(REGEXP) to create targets
| * | | | FindGTK2: Better handling of include directoriesDaniele E. Domenichelli2013-10-081-13/+15
| | | | | | | | | | | | | | | | | | | | Add a method _GTK2_ADD_TARGET_INCLUDE_DIRS to handle it.
| * | | | FindGTK2: Create targets for each libraryDaniele E. Domenichelli2013-10-081-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods: * _GTK2_ADJUST_LIB_VARS * _GTK2_ADD_TARGET_DEPENDS_INTERNAL * _GTK2_ADD_TARGET_DEPENDS are strongly inspired by FindQt4.cmake
| * | | | FindGTK2: Search for glib-object.h instead of gobject/gobject.hDaniele E. Domenichelli2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | This is the topmost include file for GObject header files
| * | | | FindGTK2: Populate GTK2_DEFINITIONS before searching for librariesDaniele E. Domenichelli2013-10-081-14/+14
| | | | |
| * | | | FindGTK2: Export GTK2_XXX_FOUND to parent scope in _GTK2_FIND_LIBRARYDaniele E. Domenichelli2013-10-081-0/+3
| | | | | | | | | | | | | | | | | | | | Also add a debug message to report if the library was found or not
* | | | | Merge topic 'FindSDL-path-suffixes'Brad King2013-10-091-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c5c217c FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)
| * | | | | FindSDL: Add path suffixes for <prefix>/include/(SDL|SDL12|SDL11)Brad King2013-10-081-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a comment explaining the purpose of the include/SDL* path suffixes. As explained in commit 7cb51739 (FindSDL: Restore accidentally dropped search paths (#13651), 2012-11-05) the include/SDL* path suffixes are for looking in the ENV{SDLDIR} location. Inspired-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
* | | | | Merge topic 'haiku-updates'Brad King2013-10-0913-53/+153
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54ef2be Haiku: Include files cleanup in cmCTest 38d5555 Haiku: Remove outdated preprocessor checks 1dc61f8 Haiku: Remove use of B_COMMON_DIRECTORY 7ebc1cb Haiku: Several fixes to platform module
| * | | | | Haiku: Include files cleanup in cmCTestAdrien Destugues2013-10-081-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * No need to use a different path from the BeOS one, which still works. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | | Haiku: Remove outdated preprocessor checksAdrien Destugues2013-10-084-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Haiku does not define __BEOS__ anymore, so there is no need to guard these BeOS specific workaround for Haiku. * The workaround themselves are not needed for Haiku as it has much better POSIX compatibility than BeOS did. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | | Haiku: Remove use of B_COMMON_DIRECTORYAdrien Destugues2013-10-084-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The common directory was removed in Haiku. Applications are now installed in the system directory. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * | | | | Haiku: Several fixes to platform moduleAdrien Destugues2013-10-084-16/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not define BEOS anymore (this includes workarounds which we don't need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the cmake files instead). * On the other hand, do define UNIX (we are trying to be compliant) and HAIKU (there is still a number of things we don't do like the average UNIX clone) * Do not use UnixPaths, as our filesystem hierarchy isn't anything like what it expects. * Do not use -nostart, which the compiler doesn't know about anymore. This used to be an Haiku extension to gcc, and is equivalent to -shared which is the default gcc option. * While "dl" functions are provided in libroot, this is always implicitly linked so there is no need to tell cmake about it. * Forcing position-independent code is not needed, so remove it. * On the other hand, include appropriate linker options for executables and shared libraries. * Support for the two available compilers in Haiku (gcc2 and gcc4) and pick the right headers and libraries according to the currently selected one. * With the adoption of the package manager, the directory layout was changed. Tell cmake where to look for header files and libraries. * As we don't define BEOS anymore, enable the workaround we still need for HAIKU as well. This is the lack of a libm (it is part of the implicitly linked in libroot) Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | Merge topic 'update-kwsys'Brad King2013-10-093-13/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | f59693b Merge branch 'upstream-kwsys' into update-kwsys 1a39f85 KWSys 2013-10-08 (96b2f6f4)
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-10-083-13/+5
| |\ \ \ \ \
| | * | | | | KWSys 2013-10-08 (96b2f6f4)KWSys Robot2013-10-083-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 96b2f6f4 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' deec6b8a..96b2f6f4 Adrien Destugues (2): 2b303bd7 SystemTools: Remove outdated preprocessor checks for Haiku 96b2f6f4 DynamicLoader: Cleanup test include files for Haiku Rolf Eike Beer (1): dbc8fa1b SystemInformation: fix truncation warnings Change-Id: I25364f58d62dd73fde0f7625d9d77ed0d4726e33
* | | | | | | Merge topic 'unset-PARENT_SCOPE'Brad King2013-10-093-2/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 261c248 unset: Add PARENT_SCOPE option
| * | | | | | | unset: Add PARENT_SCOPE optionBrad King2013-10-083-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an unset() command option to remove a variable from the calling scope, just like the set() command's PARENT_SCOPE option. Teach the Unset test to cover such cases.
* | | | | | | | Merge topic 'apple-clang-id'Brad King2013-10-0919-5/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1763c31 Set policy CMP0025 to NEW while building CMake itself aa53ee5 Add policy CMP0025 for Apple Clang compiler id compatibility ab65862 Clang: Add separate "AppleClang" compiler id
| * | | | | | | | Set policy CMP0025 to NEW while building CMake itselfBrad King2013-10-084-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake is aware of the policy's NEW behavior and the AppleClang compiler id. Set the policy to NEW explicitly to avoid the warning and get the NEW behavior. Also teach the RunCMake test infrastructure to build tests with -DCMAKE_POLICY_DEFAULT_CMP0025=NEW to avoid the policy warning in test output that must match specific regular expressions.
| * | | | | | | | Add policy CMP0025 for Apple Clang compiler id compatibilityBrad King2013-10-084-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit introduced a separate "AppleClang" compiler id for Apple's Clang distribution. Add a policy in order to support projects that expect this compiler's id to be just "Clang". When the policy is OLD or not set, map AppleClang back to Clang. Continue to use the AppleClang id internally while enabling the language, but set the CMAKE_<LANG>_COMPILER_ID after project() or enable_language() to the compatible value for use by project code.
| * | | | | | | | Clang: Add separate "AppleClang" compiler idBrad King2013-10-0811-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple distributes their own Clang build with their own version numbers that differ from upstream Clang. Use the __apple_build_version__ symbol to identify the Apple Clang compiler and report the Apple Build Version as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules that simply include the upstream equivalents. Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own source and tests to account for AppleClang.
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-10-091-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
generated by cgit v0.12 at 2024-12-29 06:35:21 (GMT)