summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindImageMagick: Find v6 include dir (#14174)Funda Wang2013-05-281-1/+1
| | | | | The header files of ImageMagick are now located at <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
* Merge topic 'geh-cleanup-identifiers'Brad King2013-05-241-0/+6
|\ | | | | | | | | 7e24997 GenerateExportHeader: Generate only C identifiers as defines
| * GenerateExportHeader: Generate only C identifiers as definesStephen Kelly2013-05-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables in this module are used to configure a header file with defines whose name depends on the name of the target. As valid names of targets may be invalid for use as defines, convert the names of the defines used to C identifiers first. This is already done in C++ code for the DEFINE_SYMBOL property. This is not as simple as ensuring that the BASE_NAME is a C identifier, because most of the define names are configurable, and because use of a BASE_NAME which is not a C identifier, such as 4square can become a C identifier by specifying a prefix in the generate_export_header macro.
* | GenerateExportHeader: Allow use of of this macro with MODULEs.Stephen Kelly2013-05-231-5/+3
|/ | | | | | | | | | | The significant issue with MODULEs is that on Windows, the exported symbols must be dllexported and they are not imported. In other export macro implementations this is done by defining an export macro outside of any ifdef which depends on definitions set on the command line. However, with cmake we already expect the DEFINE_SYMBOL to be defined, so the regular EXPORT macro can be used by such plugins.
* Merge topic 'implicit-link-sanitize-regex'Brad King2013-05-211-0/+1
|\ | | | | | | | | ffda082 Sanitize linker name to parse implicit link line (#14154)
| * Sanitize linker name to parse implicit link line (#14154)Brad King2013-05-171-0/+1
| | | | | | | | | | | | | | | | Teach CMakeParseImplicitLinkInfo to convert the CMAKE_LINKER file name to a regular expression that matches only the original name. Escape special characters like '+' so they are not treated as regex syntax. Extend the ImplicitLinkInfoTest to test handling of a CMAKE_LINKER value with many special characters.
* | Merge topic 'fix-build-without-qt4-with-qt5'Brad King2013-05-211-0/+3
|\ \ | |/ |/| | | | | 444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
| * FindQt4: Fix QUIET failure with Qt 5 but not Qt 4Stephen Kelly2013-05-211-0/+3
| | | | | | | | | | | | | | | | The call find_package(Qt4 QUIET) should be non-FATAL in that case. This fixes #14142.
* | Merge topic 'cpack-reg-key-doc'Brad King2013-05-161-2/+2
|\ \ | | | | | | | | | | | | 3fde03c Improve documentation for CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
| * | Improve documentation for CPACK_PACKAGE_INSTALL_REGISTRY_KEY.Clinton Stimpson2013-05-131-2/+2
| |/ | | | | | | Fixes issue 13787.
* | Merge topic 'vs-configurations'Brad King2013-05-162-5/+0
|\ \ | | | | | | | | | | | | 42bb42d VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generators
| * | VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generatorsBrad King2013-05-132-5/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Initialize the CMAKE_CONFIGURATION_TYPES cache entry early during EnableLanguage like the Xcode generator does. Avoid depending on the MSVC compiler information module to do it. Otherwise code like project(MyProj NONE) sets CMAKE_CONFIGURATION_TYPES late (in GenerateConfigurations), and to only "Debug" and "Release" instead of the standard set of 4. Reported-by: Paul Smith <paul@mad-scientist.net>
* | Merge topic 'UseJava-cross-compile'Brad King2013-05-161-1/+1
|\ \ | | | | | | | | | | | | 778aacc Allow using Java in a cross-compilation toolchain
| * | Allow using Java in a cross-compilation toolchainGregoire Lejeune2013-05-081-1/+1
| |/ | | | | | | | | | | Since Java is a portable language, if you want to use Java when cross-compiling, UseJava uses the JVM installed on the host. So in this case, we must use set CMAKE_JAVA_INCLUDE_FLAG_SEP for the current host.
* | Merge topic 'vs-compiler-id-arm'Brad King2013-05-161-0/+2
|\ \ | | | | | | | | | | | | e4c0465 VS: Detect MSVC compiler id on ARM toolchain
| * | VS: Detect MSVC compiler id on ARM toolchainAlexander Mohr2013-05-081-0/+2
| |/ | | | | | | | | This enables detection with the VS2012 CTP for windows Blue (8.1). To build native ARM you need to have the WOA SDK (Windows on ARM).
* | Merge topic 'doc-improvements'Brad King2013-05-1617-31/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cc2805 Docs: Clarify wording "flag used" => "flag (to|will) be used" 2378a69 Docs: Clarify that CMAKE_*_(PREFIX|SUFFIX) affect filenames 56ca34d Docs: Update description of CMAKE_(BUILD_TYPE|CONFIGURATION_TYPES) 2bab472 VS10: add detailed comment about MIDL processing e619111 Explain distribution of Win9x binary on all Windows versions. 5ca4336 FindwxWidgets: add DOC strings with usual style f57800d Fix spelling and typos (product names) bf019d7 Fix spelling and typos (non-binary) ddac8d3 Fix spelling and typos (affecting binary data / module messages) 86832ce Fix spelling and typos (affecting users)
| * | FindwxWidgets: add DOC strings with usual styleAndreas Mohr2013-05-071-3/+5
| | |
| * | Fix spelling and typos (product names)Andreas Mohr2013-05-072-3/+3
| | | | | | | | | | | | API, Borland, MinGW, UNIX, Mac OS X.
| * | Fix spelling and typos (non-binary)Andreas Mohr2013-05-0714-24/+24
| | |
| * | Fix spelling and typos (affecting binary data / module messages)Andreas Mohr2013-05-071-1/+1
| |/
* | Merge topic 'ExternalProject-svn-auth-blank'Brad King2013-05-161-4/+4
|\ \ | | | | | | | | | | | | ecd11a2 ExternalProject: Allow blank SVN_USERNAME/SVN_PASSWORD (#14128)
| * | ExternalProject: Allow blank SVN_USERNAME/SVN_PASSWORD (#14128)Matt McCormick2013-05-061-4/+4
| |/ | | | | | | | | | | | | | | | | | | With SVN_USERNAME "" SVN_PASSWORD "" in an ExternalProject_Add() call, the blank username and password will be passed to the svn checkout/update step commands.
* | Merge topic 'implicit-linker-detection'Brad King2013-05-161-1/+1
|\ \ | | | | | | | | | | | | a2bc47d Recognize ld with toolchain prefix (#13960)
| * | Recognize ld with toolchain prefix (#13960)Brad King2013-05-061-1/+1
| | | | | | | | | | | | | | | Teach CMAKE_PARSE_IMPLICIT_LINK_INFO to recognize linker invocations of the form "<toolchain-prefix>-ld" e.g. "x86_64-pc-linux-gnu-ld".
* | | Merge topic 'cpack-nsis-uninstall'Brad King2013-05-161-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 40566ef CPack/NSIS: Obtain path from which to uninstall from registry (#14124)
| * | | CPack/NSIS: Obtain path from which to uninstall from registry (#14124)David Golub2013-05-021-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | Without this, when CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set, the installer tries to uninstall the old version from the default installation path for the new version, rather than using the path from the registry where the old version is installed.
* | | Merge topic 'WindowsPaths-MinGW-cross-compile-only'Brad King2013-05-161-2/+4
|\ \ \ | | | | | | | | | | | | | | | | f9eee7f Windows: Search '/' prefix only when cross compiling (#10994)
| * | | Windows: Search '/' prefix only when cross compiling (#10994)Brad King2013-04-251-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit dac78148 (...makes the mingw cross compiler work out of the box..., 2007-08-02) added to CMAKE_SYSTEM_PROGRAM_PATH and CMAKE_SYSTEM_LIBRARY_PATH paths like "/bin" and "/lib" with no Windows drive letter so that cross-compiling to Windows from Linux would search these paths under CMAKE_FIND_ROOT_PATH. Later commit 2a782880 (...use CMAKE_SYSTEM_PREFIX_PATH when possible, 2008-01-16) generalized this approach by instead adding "/" to CMAKE_SYSTEM_PREFIX_PATH. Both commits assumed that the paths would never match anything on Windows hosts without a drive letter. However, Windows evaluates these paths relative to the current working drive letter so find_* commands may report paths like "/lib/..." when paths like "c:/lib/..." exist on what happens to be current drive. Such drive-less paths are not reliable when the working drive changes, so we should not use them. Fix WindowsPaths.cmake to add '/' to CMAKE_SYSTEM_PREFIX_PATH only when cross-compiling to Windows from a non-Windows host. This will avoid searching and finding local paths without a drive letter on Windows.
* | | Merge topic 'check-compiler-flag-locale'Brad King2013-05-162-0/+25
|\ \ \ | | | | | | | | | | | | | | | | 5272372 Check{C,CXX}CompilerFlag: Test using C locale (#14102)
| * | | Check{C,CXX}CompilerFlag: Test using C locale (#14102)Brad King2013-04-222-0/+25
| |/ / | | | | | | | | | | | | | | | | | | Set the locale to C while running the compiler for these checks because we match the resulting warning messages in English only. Suggested-by: Marco Nolden <m.nolden@dkfz-heidelberg.de>
* | | Merge topic 'Cuda_WRAP_SRCS_duplicates'Brad King2013-05-161-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 32b582d FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.
| * | | FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.Marcel Loose2013-04-181-0/+3
| |/ / | | | | | | | | | | | | | | | As of CMake 2.8.8, the INCLUDE_DIRECTORIES() command does not de-duplicate entries. Failure to do so can lead to an extremely long and repetitive list of -I entries on the command line.
* | | Merge topic 'cuda_compute_build_path'Brad King2013-05-161-1/+7
|\ \ \ | | | | | | | | | | | | | | | | cd2d248 FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.
| * | | FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.Mathias Gaunard2013-04-181-1/+7
| |/ / | | | | | | | | | | | | | | | | | | make CUDA_COMPUTE_BUILD_PATH use a relative path to the current binary directory instead of the current source directory if the source file considered is in the current binary directory. This is done to shorten the paths given to the compiler.
* | | Merge topic 'OpenGL-require-includes'Brad King2013-05-161-91/+88
|\ \ \ | | | | | | | | | | | | | | | | | | | | 5be3593 FindOpenGL: require headers to be found on non-Windows platforms (#13746) b10a171 FindOpenGL: simplify OS selection code
| * | | FindOpenGL: require headers to be found on non-Windows platforms (#13746)Rolf Eike Beer2013-04-171-1/+7
| | | |
| * | | FindOpenGL: simplify OS selection codeRolf Eike Beer2013-04-171-91/+82
| |/ / | | | | | | | | | | | | | | | This was using nested if's, now it uses elseif to flatten that. It also removes one "if" from the general "else" branch that checks for Apple, as that has it's own branch anyway and can't be true at this point.
* | | Merge topic 'xcode-explicitFileType'Brad King2013-05-163-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 5683146 Xcode: Use explicitFileType to mark source types (#14093)
| * | | Xcode: Use explicitFileType to mark source types (#14093)Brad King2013-04-163-3/+3
| |/ / | | | | | | | | | | | | Replace use of lastKnownFileType with explicitFileType to insist that Xcode treat the file as we ask.
* | | Merge topic 'AddIARToolchain2'Brad King2013-05-169-4/+154
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d118b8b Add IAR to the CMakeDetectC(XX)CompilerID.c(pp).in d33f406 Add regexps for the IAR toolchain to the vendor list. 22fb73a Add support files for C, C++ and ASM for the IAR toolchain.
| * | | Add IAR to the CMakeDetectC(XX)CompilerID.c(pp).inAlex Neundorf2013-04-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With the AVR IAR compiler this can't be found, but it works e.g. for the ARM AVR compiler. Alex
| * | | Add regexps for the IAR toolchain to the vendor list.Alex Neundorf2013-04-153-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IAR compilers produce object files where the plain strings at least sometimes can't be found, see: http://www.cmake.org/Bug/view.php?id=10176#c19598 Alex
| * | | Add support files for C, C++ and ASM for the IAR toolchain.Alex Neundorf2013-04-154-0/+128
| |/ / | | | | | | | | | | | | | | | | | | The original feature request is at http://www.cmake.org/Bug/view.php?id=10176 Documentation can be found at http://www.iar.com/website1/1.0.1.0/675/1/ Alex
* | | Merge topic 'CrossCompilingFix13796'Brad King2013-05-161-5/+5
|\ \ \ | | | | | | | | | | | | | | | | efb19b6 CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)
| * | | CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)Alex Neundorf2013-04-151-5/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Make the CMAKE_HOST_* variables always available in the toolchain file. They are when the file is included in CMakeDetermineSystem.cmake, and now also here. For the non-cross-compiling case this does not change anything at all. Alex
* | | Merge topic 'fix-comment-typos'Brad King2013-05-161-5/+5
|\ \ \ | | | | | | | | | | | | | | | | 8e0da4c Fix some copyastos in the DetermineRCCompiler file.
| * | | Fix some copyastos in the DetermineRCCompiler file.Stephen Kelly2013-04-141-5/+5
| |/ /
* | | Merge topic 'FindOpenSSL-cross-compiling'Brad King2013-05-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 1b614e0 FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)
| * | | FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)Robin Lee2013-04-121-1/+1
| |/ / | | | | | | | | | | | | | | | Use of the mis-spelled variable name 'CMAKE_CROSS_COMPILING' was introduced by commit 4b793ad1 (FindOpenSSL: find cross-compiled OpenSSL from MinGW, 2012-07-23). Fix the spelling.
View Lorry Controller Status