summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindQt4-more-plugins'Brad King2014-07-291-3/+3
|\ | | | | | | | | 4b5052b0 FindQt4: Add nativewifi and qtga plugins
| * FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| | | | | | | | | | While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS instead of duplicating the list.
* | Merge topic 'fix-re-cmake-with-compiler'Brad King2014-07-281-1/+1
|\ \ | | | | | | | | | | | | | | | 8981513a CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cache 731427a6 cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILER
| * | CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cacheBrad King2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | If find_program does not find CMAKE_<LANG>_COMPILER, use set_property() to force the value to be that of CMAKE_<LANG>_COMPILER_INIT instead of set(). This allows us to set the value without re-specifying the type and documentation, thus preserving what find_program set.
* | | Merge topic 'cpack-ifw-generator'Brad King2014-07-283-0/+389
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b9be4d21 Help: Add notes for topic 'cpack-ifw-generator' 73b336c9 CPackIFW: Replace use of strftime with cmTimestamp 44850a26 CPack: Add an "IFW" generator for Qt Framework Installer
| * | | CPack: Add an "IFW" generator for Qt Framework InstallerKonstantin Podsvirov2014-07-283-0/+389
| |/ / | | | | | | | | | | | | | | | | | | | | | Add support for packaging with the Qt Framework Installer tools: http://qt-project.org/doc/qtinstallerframework/index.html Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | FindImageMagick: Provide per-component include dirs (#15007)Brad King2014-07-231-2/+9
| | | | | | | | | | | | | | | Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned in the documentation but was not set before.
* | | FindImageMagick: Find arch include dir (#15007)bastien ROUCARIES2014-07-231-1/+18
|/ /
* | Merge topic 'fix-QCC-compile-flags'Brad King2014-07-216-27/+41
|\ \ | | | | | | | | | | | | 3151024d QNX: Add missing flags for configurations and artifact creation.
| * | QNX: Add missing flags for configurations and artifact creation.Stephen Kelly2014-07-176-27/+41
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc macro and teach it to call __compiler_gnu internally. Remove the corresponding pieces from the Platform/QNX*.cmake modules. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. Co-Author: Brad King <brad.king@kitware.com>
* | CTest: Fix MemoryCheckType from 'ctest -T MemCheck'Bill Hoffman2014-07-161-0/+1
| | | | | | | | | | | | Before this commit, you would have to run ctest -S mode to get MemoryCheckType to work. This is because CMAKE_COMMAND was not set. The fix is to use cmSystemTools::GetCMakeCommand instead.
* | Merge topic 'FindCurses-overhaul'Brad King2014-07-151-79/+98
|\ \ | | | | | | | | | | | | 6c8364e6 FindCurses: Overhaul Curses and NCurses search logic (#15011)
| * | FindCurses: Overhaul Curses and NCurses search logic (#15011)Brad King2014-07-141-79/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Produce a more consistent result by finding only a single include directory and reporting which headers may be included from it. The previous search for each header separately might find pieces from separate and incompatible packages. While at it, provide the CURSES_INCLUDE_DIRS result variable to be consistent with other modules.
* | | FindImageMagick: Use pkgconfig hints if available (#14012)Rex Dieter2014-07-141-0/+10
|/ / | | | | | | Tested-by: bastien ROUCARIES <roucaries.bastien@gmail.com>
* | Merge topic 'FindCurses-blank-at-eof'Brad King2014-07-141-1/+0
|\ \ | | | | | | | | | | | | ccf2fca1 FindCurses: Remove blank line at end of file
| * | FindCurses: Remove blank line at end of fileBrad King2014-07-141-1/+0
| | |
* | | Merge topic 'wince-fix-dll-linking'Brad King2014-07-141-4/+6
|\ \ \ | |/ / |/| | | | | | | | 7e1283e4 MSVC: Fix linking of DLLs on WinCE (#15013)
| * | MSVC: Fix linking of DLLs on WinCE (#15013)Brad King2014-07-101-4/+6
| |/ | | | | | | | | | | | | | | On WinCE we must link both shared libraries and executables with the /subsystem:windowsce flag. Teach Platform/Windows-MSVC to pass it to the linker in both cases. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
* | Merge topic 'FindSWIG-swig3.0'Brad King2014-07-091-1/+2
|\ \ | | | | | | | | | | | | 7400695e FindSWIG: Add support for swig 3.0 application
| * | FindSWIG: Add support for swig 3.0 applicationSylvain Joubert2014-07-071-1/+2
| | |
* | | Merge topic 'CMakeExpandImportedTargets-CMP0045'Brad King2014-07-091-2/+10
|\ \ \ | |/ / |/| | | | | | | | 49f32168 CMakeExpandImportedTargets: Do not read property on non-target (#15008)
| * | CMakeExpandImportedTargets: Do not read property on non-target (#15008)Brad King2014-07-071-2/+10
| |/ | | | | | | | | Avoid behavior that is disallowed by CMP0045. Check whether a target exists before trying to read its properties.
* | Merge topic 'dev/export-from-obj-libs'Brad King2014-07-071-0/+1
|\ \ | | | | | | | | | | | | 5ca1d3d5 GenerateExportHeader: support exporting from OBJECT libraries
| * | GenerateExportHeader: support exporting from OBJECT librariesBen Boeckel2014-07-031-0/+1
| | |
* | | Merge topic 'WriteCompilerDetectionHeader-valid-prefix'Brad King2014-07-071-0/+8
|\ \ \ | | | | | | | | | | | | | | | | b47c125f WCDH: Ensure that the prefix argument to the macro is valid.
| * | | WCDH: Ensure that the prefix argument to the macro is valid.Stephen Kelly2014-07-021-0/+8
| |/ / | | | | | | | | | | | | The prefix must be a C-identifier because it is written as the prefix of preprocessor macros and possibly structs.
* | | Merge topic 'no-cross-install_name_tool'Brad King2014-07-071-3/+1
|\ \ \ | |/ / |/| | | | | | | | 591a7388 OS X: Only search for install_name_tool if the toolchain has it
| * | OS X: Only search for install_name_tool if the toolchain has itFlorent Castelli2014-07-021-3/+1
| | | | | | | | | | | | | | | | | | When cross compiling, toolchains won't have install_name_tool, which is provided by Xcode and command line tools on OS X. This is a Mach-O specific utility and not required on all platforms.
* | | Merge topic 'FindJNI-ppc64le'Brad King2014-07-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | 18ac6713 FindJNI: search for ppc64 on ppc64le as well
| * | FindJNI: search for ppc64 on ppc64le as wellDinar Valeev2014-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | IcedTea 2.5 have changed libarch for ppc64le to ppc64. Adjust FindJNI to look for both for backward compatibility. Signed-off-by: Dinar Valeev <dvaleev@suse.com>
* | | Merge topic 'cuda_osx_clang'Brad King2014-07-012-4/+14
|\ \ \ | | | | | | | | | | | | | | | | 32bcec5f FindCUDA: Fix OSX Clang & no C language enabled
| * | | FindCUDA: Fix OSX Clang & no C language enabledAdam Strzelecki2014-06-302-4/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting default CUDA_HOST_COMPILER we must dereference CMAKE_C_COMPILER, i.e. /usr/bin/clang should be used instead /usr/bin/cc which is symlink. Otherwise CUDA thinks it is GCC and issues -dumpspecs which is unknown option to Clang. Also in case neither CMAKE_C_COMPILER is defined (project does not use C language) nor CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let nvcc use its own default C compiler.
* | | Merge topic 'FindVTK-drop-4.0-support'Brad King2014-07-011-101/+11
|\ \ \ | | | | | | | | | | | | | | | | 117e7e11 FindVTK: Drop support for finding VTK 4.0
| * | | FindVTK: Drop support for finding VTK 4.0Brad King2014-07-011-101/+11
| |/ / | | | | | | | | | | | | Convert to a simple thin-wrapper around the find_package(VTK NO_MODULE). This makes the code much simpler and improves error messages.
* | | Merge topic 'FindQt4-ignore-qt5'Brad King2014-06-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 567d4d8d FindQt4: Don't further process qmake if it does not belong to Qt4
| * | | FindQt4: Don't further process qmake if it does not belong to Qt4Nils Gladitz2014-06-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | If the only qmake that can be found belongs to Qt5 the find module would otherwise still further interrogate it and issue diagnostics which are specific to Qt4.
* | | | Merge topic 'vs14-generator'Brad King2014-06-303-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0e298ad Help: Add notes for topic 'vs14-generator' 5c105140 Tests: Simplify LoadCommand tests b1cbd577 FindBoost: Add -vc140 mangling for VS 14 bdc7d9c8 VS14: Fix Cl and Link flag tables as previous versions d96b3f68 VS14: Generate flag tables from MSBuild v140 tool files 65624c39 VS14: Add Visual Studio 14 generator (#14982) 8635ac23 Tests/Preprocess: Remove unnecessary VS version tests
| * | | | FindBoost: Add -vc140 mangling for VS 14Brad King2014-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | Co-Author: Pawel Stopinski <diokhan@go2.pl>
| * | | | VS14: Add Visual Studio 14 generator (#14982)Brad King2014-06-252-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the generator "Visual Studio 14" without any year because this version of VS does not provide a year in the product name. Copy cmGlobalVisualStudio12Generator to cmGlobalVisualStudio14Generator and update version numbers accordingly. Add the VS14 enumeration value. Teach the platform module Windows-MSVC to set MSVC14 and document the variable. Teach module InstallRequiredSystemLibraries to look for the VS 14 runtime libraries. Teach tests CheckCompilerRelatedVariables, VSExternalInclude, and RunCMake.GeneratorToolset to treat VS 14 as they do VS 10, 11, and 12. Co-Author: Pawel Stopinski <diokhan@go2.pl>
* | | | | Merge topic 'FindOpenMP-intel-qopenmp'Brad King2014-06-301-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4671f3ab FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp
| * | | | | FindOpenMP: ICC 15 deprecates -openmp, use -qopenmpAdam Strzelecki2014-06-271-1/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Intel Composer XE 2015 Beta 2 deprecates all options starting with -o for sake of compatibility with other compilers expecting anything goes after -o... is output file name.
* | | | | Merge topic 'FindJPEG-new-windows-name'Brad King2014-06-301-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | 115811dc FindJPEG: Add alternative name 'libjpeg'
| * | | | FindJPEG: Add alternative name 'libjpeg'Sebastian Elsner2014-06-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Newer versions of jpeglib build the .lib file on Windows with a different name by default. Its now called libjpeg.lib instead of jpeg.lib.
* | | | Merge topic 'UseSWIG-fix-noproxy-check'Brad King2014-06-271-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | e932ac9c UseSWIG: Fix check for noproxy flag (#14990)
| * | | UseSWIG: Fix check for noproxy flag (#14990)Brad King2014-06-251-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The check for this flag added by commit v3.0.0-rc1~284^2 (UseSWIG: Name python module according to swig flags, 2013-11-26) can get false positives on flags like "-noproxydel". Improve the check to match only "-noproxy". Suggested-by: Garth Wells <gnw20@cam.ac.uk>
* | | Merge topic 'update-cdash-location'Brad King2014-06-251-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | 57ddde52 Update CDash server URL 1bd4e006 Tests: Fix CMAKE_TESTS_CDASH_SERVER parsing
| * | | Update CDash server URLBrad King2014-06-241-1/+0
| | |/ | |/| | | | | | | It is now at open.cdash.org and does not start in "/CDash".
* | | FindGLUT.cmake: Add imported targets and documentationPhilipp Moeller2014-06-241-8/+69
| | | | | | | | | | | | Also let find_library really search for frameworks on OS X.
* | | FindX11: fix documentation formatting errorPhilipp Möller2014-06-241-39/+36
| | | | | | | | | | | | While at it, remove excess indentation.
* | | FindGLEW: Add imported target and documentationPhilipp Möller2014-06-231-0/+16
| | |
generated by cgit v0.12 at 2025-02-21 08:36:10 (GMT)