Commit Graph

19748 Commits

Author SHA1 Message Date
David Cole 8dbe39c6c7 Merge topic 'generator-expression-refactor'
f20af79 Handle colons as a special case in the generator expression parser.
fb578c8 Fix the regular expression validator for target names.
2012-09-25 15:17:45 -04:00
David Cole 8e29b375c4 Merge topic 'UpdateEmacsMode-bug0013548'
301e67e cmake-mode.el: add local keybindings
6d1e4ef cmake-mode.el: Use more readable regex and case-fold-search
2012-09-25 15:17:35 -04:00
David Cole f5513f93bf Merge topic 'clang-PIE'
ada9efd Clang: All versions know about -fPIE (#13550)
6e34aea Clang: Split Compiler/Clang* modules out from GNU (#13550)
2012-09-25 15:17:26 -04:00
David Cole 92be70d683 Merge topic 'vs8-generator-doc'
750fcaa VS8: Remove '.NET' from generator description (#10158)
2012-09-25 15:17:17 -04:00
David Cole 998a17d098 Merge topic 'file-DOWNLOAD-EXPECTED_HASH'
95a0011 file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=value
2012-09-25 15:17:01 -04:00
Benjamin Eikel 68c6b134d0 FindSDL: Stay compatible with old input variables
Suggested-by: David Cole <david.cole@kitware.com>
2012-09-25 13:56:04 -04:00
Benjamin Eikel 9ed24c5316 FindSDL: Remove from find_... calls PATHS that are set by default
Use PATH_SUFFIXES to add SDL parts to standard paths.
2012-09-25 13:55:51 -04:00
Benjamin Eikel 38a0f71574 FindSDL: Add my copyright tag to all FindSDL_* modules 2012-09-25 13:52:48 -04:00
Benjamin Eikel 020d2131ed FindSDL: Add version support 2012-09-25 13:52:43 -04:00
Benjamin Eikel 61a566c02a FindSDL: Format documentation 2012-09-25 13:52:40 -04:00
Benjamin Eikel 22154c7fc2 FindSDL: Update documentation 2012-09-25 13:52:35 -04:00
Benjamin Eikel 4541c07864 FindSDL: Add version support for FindSDL_ttf 2012-09-25 13:52:30 -04:00
Benjamin Eikel a28c24726b FindSDL: Use SDL_TTF prefix for variables 2012-09-25 13:52:27 -04:00
Benjamin Eikel 9f5dbf4497 FindSDL: Update documentation 2012-09-25 13:52:25 -04:00
Benjamin Eikel d83f80d174 FindSDL: Add version support for FindSDL_mixer 2012-09-25 13:52:22 -04:00
Benjamin Eikel c10b69152c FindSDL: Use SDL_MIXER prefix for variables 2012-09-25 13:52:18 -04:00
Benjamin Eikel 03dd6cc4ff FindSDL: Pass SDL_SOUND_LIBRARY to FIND_PACKAGE_HANDLE_STANDARD_ARGS 2012-09-25 13:52:12 -04:00
Benjamin Eikel 326becad31 FindSDL: Use same capitalization for FPHSA as file name 2012-09-25 13:51:53 -04:00
Benjamin Eikel cfe5b87e8c FindSDL: Version support for FindSDL_sound 2012-09-25 13:51:50 -04:00
Benjamin Eikel 776d3fe325 FindSDL: Format the documentation 2012-09-25 13:51:46 -04:00
Benjamin Eikel a5194e2ffb FindSDL: Add "cmake_minimum_required" to "try_compile" project 2012-09-25 13:51:34 -04:00
Benjamin Eikel 2c3b8255c5 FindSDL: Use SDL_IMAGE prefix for varibales
This makes FindPackageHandleStandardArgs and FeatureSummary work correctly.
Keep old variables for compatibility.
Furthermore, format the documentation.
2012-09-25 13:51:19 -04:00
Benjamin Eikel ef5b439cc1 FindSDL: Use prefix SDL_NET, because it matches the file name.
Add new variables, keep the old ones for compatibility.
Format the documentation header.
2012-09-25 13:51:17 -04:00
Benjamin Eikel 34e1a2ae56 FindSDL: Version support for FindSDL_image 2012-09-25 13:51:14 -04:00
Benjamin Eikel a5796112cb FindSDL: Add version support for FindSDL_net 2012-09-25 13:51:06 -04:00
Nils Gladitz 9ace801578 ctest_update: Tell svn not to prompt interactively (#13024)
While at it, add SVNOptions/CTEST_SVN_OPTIONS configuration settings to
add options to all svn invocations instead of just "svn update".
2012-09-25 13:36:47 -04:00
Kitware Robot f00f58fe13 CMake Nightly Date Stamp 2012-09-25 00:01:05 -04:00
Brad King df928646ba OS X: Ignore MACOSX_DEPLOYMENT_TARGET during Xcode compiler id
Xcode honors this environment variable if the project file does not set
it.  Hide it from Xcode while building the compiler id project.
2012-09-24 14:44:07 -04:00
Kitware Robot d550801a3d CMake Nightly Date Stamp 2012-09-24 00:01:04 -04:00
Stephen Kelly 92b6d85519 Enable deprecated API when using Qt 5.
The QAbstractItemModel::reset() method is deprecated in Qt 5, and
therefore not part of the API by default (on non-Windows).

The replacement for it is beginResetModel/endResetModel which are
available from Qt 4.6 onwards.

The minimum version of Qt required is currently 4.4, so enable the
deprecated API instead of changing that.
2012-09-23 20:13:06 +02:00
Kitware Robot eb5da9c71d CMake Nightly Date Stamp 2012-09-23 00:01:03 -04:00
Brad King e7e613efbf OS X: Teach deployment target sanity check about SDK names
Since commit 1786b121 (OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK
name, 2012-09-21) we support names like "macosx" or "macosx10.7" as the
specified value of CMAKE_OSX_SYSROOT.  Extend the SDK name->path
conversion to save the original value and also convert into a temporary
variable for the Xcode generator.  Re-implement the deployment target
sanity check to detect the version from the transformed path.
2012-09-22 07:43:43 -04:00
Kitware Robot f31de15b5e CMake Nightly Date Stamp 2012-09-22 00:01:04 -04:00
Philip Lowman a722780498 CMakeDetermineVSServicePack: Visual Studio 2012 added 2012-09-21 23:11:18 -04:00
Brad King 43b74793de OS X: Further improve default CMAKE_OSX_SYSROOT selection
Since commit 230ea218 (OS X: Improve default CMAKE_OSX_SYSROOT
selection, 2012-09-21) we always set CMAKE_OSX_SYSROOT if any SDK is
found in order to support Makefile generator builds with Xcode >= 4.3
without the command-line tools installed.  However, in the basic
POSIX-only case of the Makefile generator with command-line tools and no
CMAKE_OSX_ARCHITECTURES we should not select any SDK by default.
2012-09-21 14:45:54 -04:00
Brad King 2690738458 OS X: If CMAKE_OSX_SYSROOT is already set do not compute default
The default computation logic is non-trivial.  Do not bother with it if
the value is already known.
2012-09-21 14:45:54 -04:00
Brad King 7995722e91 OS X: Simplify selection of CMAKE_OSX_ARCHITECTURES
Incremental changes to the logic over time have led to simply
initializing the cache entry with the environment value.
2012-09-21 14:45:53 -04:00
Brad King 1786b121b4 OS X: Allow CMAKE_OSX_SYSROOT to be a logical SDK name
Xcode supports SDKROOT values that just name an SDK rather than
specifying the full path to it.  Recognize these values and handle them.
For Xcode we just put the value directly in the generated project file.
For Makefile generators we ask xcodebuild to provide the full path to
the named SDK.

Suggested-by: Jason DiCioccio <jd@ods.org>
2012-09-21 13:31:46 -04:00
Brad King 242f673829 Tests/Assembler: Use CMAKE_OSX_SYSROOT to generate .s file
On OS X if the user-provided flags do not include -isysroot and
CMAKE_OSX_SYSROOT is defined then add the proper -isysroot flag to the C
compiler invocation we use to generate the .s file.
2012-09-21 11:15:23 -04:00
Brad King a1c032b994 bootstrap: Suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot
In order to bootstrap on OS X with Xcode without the command line tools
one must add -isysroot to CFLAGS and CXXFLAGS.  In this case the flags
will make it into the configured CMake.  Set CMAKE_OSX_SYSROOT to empty
in the initial cache to prevent CMake from adding -isysroot again.
2012-09-21 10:06:00 -04:00
Brad King 230ea218a7 OS X: Improve default CMAKE_OSX_SYSROOT selection
Simplify the search for OSX_DEVELOPER_ROOT and allow it to fail if no
"/Developer" exists.  When it does exist, always find a MacOSX SDK
inside it to use as the default CMAKE_OSX_SYSROOT.  Otherwise set
CMAKE_OSX_SYSROOT to empty.
2012-09-21 08:59:01 -04:00
Brad King a0a0877a1e OS X: Always generate -isysroot if any SDK is in use
Drop the last use of CMAKE_OSX_SYSROOT_DEFAULT.  Replace internal
platform variable CMAKE_${lang}_HAS_ISYSROOT with a more general
CMAKE_${lang}_SYSROOT_FLAG variable.  If the -isysroot flag exists and
CMAKE_OSX_SYSROOT points to an SDK (not "/") then always add it to
compiler command lines.  This is already done in the Xcode IDE.
2012-09-21 08:53:42 -04:00
Brad King 33a60e6bd1 Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULT
The condition for entering the block where the value is used
can never be true anymore.
2012-09-21 08:47:02 -04:00
Stephen Kelly b8e61d687a Refactor GetCompileDefinitions a bit.
It is now easier to add generator expressions.
2012-09-21 13:31:12 +02:00
Stephen Kelly 2c2b25b203 Return a std::string from GetCompileDefinitions. 2012-09-21 13:28:54 +02:00
Stephen Kelly b7e48e0acb Add an AppendDefines std::string overload.
This makes it easier to use with cmGeneratorTarget::GetCompileDefinitions.
2012-09-21 13:28:54 +02:00
Stephen Kelly 9a160871d0 Convert paths in INCLUDE_DIRECTORIES property to Unix slashes.
Duplicate some of the logic from the include_directories command.
2012-09-21 13:28:54 +02:00
Stephen Kelly 4557c8db48 Don't prepend a path before generator expressions in include_directories. 2012-09-21 13:28:54 +02:00
Stephen Kelly c6abc41eb5 Add include guard for cmGeneratorExpression. 2012-09-21 13:28:54 +02:00
Stephen Kelly 0ff4e3f0b8 Port remaining code to GetCompileDefinitions(). 2012-09-21 13:28:53 +02:00