summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 'UseJava-jar-manifest'Brad King2013-10-071-3/+13
|\ | | | | | | | | 69aff17 UseJava: Add support for the jar 'm' (Manifest) option
| * UseJava: Add support for the jar 'm' (Manifest) optionSimon Levermann2013-09-231-3/+13
| |
* | Merge topic 'deprecation-macro-refactor'Brad King2013-10-071-2/+8
|\ \ | | | | | | | | | | | | | | | cdf55d5 GEH: Make each element of the deprecation macros overridable. 80d5090 GEH: Use the macro for the deprecation attribute after definiting it.
| * | GEH: Make each element of the deprecation macros overridable.Stephen Kelly2013-09-231-0/+6
| | | | | | | | | | | | | | | This way, we can override only FOO_DEPRECATED to silence deprecation for a library.
| * | GEH: Use the macro for the deprecation attribute after definiting it.Stephen Kelly2013-09-231-2/+2
| |/ | | | | | | This way, it is more-easily overridden.
* | Merge topic 'EclipseFixWarningMessage'Brad King2013-10-071-19/+27
|\ \ | | | | | | | | | | | | | | | | | | 5f11b8d Eclipse: add version 4.3 for completeness 2b63734 Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set 1ff8c21 CMakeFindEclipse: use lowercase for macro calls
| * | Eclipse: add version 4.3 for completenessAlex Neundorf2013-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | This just adds the version number, there are no features depending on this. Alex
| * | Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already setAlex Neundorf2013-09-181-17/+23
| | | | | | | | | | | | | | | | | | This fixes #14422. Alex
| * | CMakeFindEclipse: use lowercase for macro callsAlex Neundorf2013-09-181-2/+2
| | | | | | | | | | | | Alex
* | | Merge topic 'openssl-advanced'Brad King2013-10-071-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 864e2a3 FindOpenSSL: mark variables as advanced for MSVC (#14418)
| * | | FindOpenSSL: mark variables as advanced for MSVC (#14418)Rolf Eike Beer2013-09-171-0/+2
| | | |
* | | | Merge topic 'FixTypoInGraphvizDocs'Brad King2013-10-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bbb0d6f CMakeGraphVizOptions.cmake: Fix typo in documentation
| * | | | CMakeGraphVizOptions.cmake: Fix typo in documentationAlex Neundorf2013-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'FindwxWidgets-msvc-x64'Brad King2013-10-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
| * | | | | FindwxWidgets: Look in x64 directories for MSVC (#14393)Marius Luca2013-09-101-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the 64 bit version of wxWidgets using nmake the library folders become vc_x64_lib and vc_x64_dll and can coexist with the win32 version.
* | | | | Merge topic 'vs-compiler-id-tolerate-diagnostics'Brad King2013-10-071-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
| * | | | | VS: Tolerate diagnostic output while detecting cl (#14387)Brad King2013-09-031-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the VS IDE build output setting Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project output verbosity is set to "Diagnostic" the build output contains a " (TaskId:###)" suffix on the CMAKE_<lang>_COMPILER= line used to extract the compiler executable location. Strip this suffix before checking that the reported location exists.
* | | | | Merge topic 'deprecate-add_compiler_export_flags'Brad King2013-10-071-13/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0f3a666 GenerateExportHeader: Deprecate add_compiler_export_flags function.
| * | | | | GenerateExportHeader: Deprecate add_compiler_export_flags function.Stephen Kelly2013-09-021-13/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | This is made obsolete by the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties.
* | | | | Merge topic 'FindPython_versions'Brad King2013-10-072-14/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | afd4f7f FindPython*: simplify version selection
| * | | | | FindPython*: simplify version selectionRolf Eike Beer2013-08-312-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake already provides the version components split into variables, no need to split them again.
* | | | | | Merge topic 'FindLua'Brad King2013-10-071-0/+153
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89cfa20 Modules: add FindLua.cmake
| * | | | | | Modules: add FindLua.cmakeRolf Eike Beer2013-08-311-0/+153
| |/ / / / / | | | | | | | | | | | | | | | | | | This is a version agnostic variant of FindLua50.cmake and FindLua51.cmake.
* | | | | | Merge topic 'add-find_dependency-macro'Brad King2013-10-071-2/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb501a2 CMakePackageConfigHelpers: Add a find_dependency macro
| * | | | | | CMakePackageConfigHelpers: Add a find_dependency macroStephen Kelly2013-08-301-2/+37
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro handles the EXACT, REQUIRED and QUIET options and sets an appropriate NOT_FOUND_MESSAGE for the package if a dependency is not found.
* | | | | | Merge topic 'FortranCInterface-cross-compile'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
| * | | | | | FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)Michel Zou2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After building the test binary tell find_program to search for it with the ${CMAKE_EXECUTABLE_SUFFIX} so that the .exe can be found. Since find_program is normally used to locate host tools while cross-compiling it needs this hint to find the target binary. Suggested-by: Denis Barbier <bouzim@gmail.com>
* | | | | | | OS X: Search system SDKs for frameworksBrad King2013-09-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Modules/Platform/Darwin.cmake set CMAKE_SYSTEM_FRAMEWORK_PATH to include framework directories from inside the system SDK corresponding to CMAKE_OSX_SYSROOT. Suggested-by: Sean McBride <sean@rogue-research.com>
* | | | | | | Merge topic 'wince-archfam'Brad King2013-09-261-4/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b15ffc MSVC: Fix WinCE arch family preprocessor symbol (#14436)
| * | | | | | | MSVC: Fix WinCE arch family preprocessor symbol (#14436)Patrick Gansterer2013-09-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bd827f98 (Use COFF file header header for architecture detection, 2013-08-05) the MSVC_<lang>_ARCHITECTURE_ID value computed by CMakeDetermineCompilerId.cmake changed for WinCE architectures to be the exact architecture read from the PE header. Fix platform preprocessor definitions in Modules/Platform/Windows-MSVC.cmake to correspond to the architecture family (ARM or SHx) instead of the specific architecture.
* | | | | | | | VS: Use version-specific subsystem for WinCE compiler id (#14440)Patrick Gansterer2013-09-251-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subsystem must be set to WINDWOSCE for some SDKs to link an executable. Set it to 9 for VS2005 and to 8 for VS2008, since the value differs between the different Visual Studio versions.
* | | | | | | MSVC: Fix version test for linking corelibc on Windows CE (#14420)Patrick Gansterer2013-09-231-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04) we made corelibc conditional on the MSVC version, but the version value was incorrect. Update it to use corelibc for VS 2008 and below.
* | | | | | FindHDF5: Fix regression in per-configuration library selectionBrad King2013-09-191-36/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FindHDF5 was first added in commit e6734068 (Add HDF5 find module..., 2009-08-24) it contained a workaround for a bug in SelectLibraryConfigurations that did not transform lists correctly. That bug was fixed by commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28). Then refactoring in commit 04d4dc33 (SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars, 2013-07-08) changed undocumented behavior on which the original workaround relied. The result puts entries like HDF5_hdf5_LIBRARY_DEBUG-NOTFOUND in HDF5_LIBRARIES. Fix this by dropping the original workaround since the underlying issue has been fixed anyway. Use the HDF5_${LIB}_LIBRARY selected by the call to select_library_configurations directly.
* | | | | Merge topic 'FindPNG-compatibility'Brad King2013-09-171-5/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 6816044 FindPNG: Honor old PNG_LIBRARY if provided (#14398)
| * | | | FindPNG: Honor old PNG_LIBRARY if provided (#14398)Brad King2013-09-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2a797539 (FindPNG: improve library detection, 2013-07-27) we split the search for PNG into separate PNG_LIBRARY_DEBUG and PNG_LIBRARY_RELEASE variables. However, if a project or user sets the old PNG_LIBRARY value we must honor it instead of searching. While at it, mark PNG_LIBRARY_RELEASE and PNG_LIBRARY_DEBUG as advanced and remove a stray debug message.
* | | | | FindCUDA: Always list custom command outputs in their targetsBrad King2013-09-131-16/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake's intended interface for linking to explicit object files (marked with EXTERNAL_OBJECT) is that only those listed as target sources should be linked. Drop FindCUDA's attempt to hide the .obj files from VS IDE project files, which depends on VS-version-specific behavior of linking custom command outputs that happen to be named "*.obj". CMake puts external object files in a dedicated source group anyway.
* | | | MSVC: Drop /link from executable link lines with NinjaBrad King2013-09-111-1/+0
| |/ / |/| | | | | | | | | | | | | | | | | In commit fb9f73de (MSVC: Invoke 'link' directly for executables, 2013-04-08) we forgot to remove the /link option handling added by commit e31df039 (Ninja: move <OBJECTS> in front of the first linker option, 2012-09-27) to the Platform/Windows-MSVC module. Drop it now.
* | | Merge topic 'FindImageMagick-hdri'Brad King2013-08-271-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 5803b94 FindImageMagick: Find libraries named with HDRI support (#14348)
| * | | FindImageMagick: Find libraries named with HDRI support (#14348)Eric BĂ©langer2013-08-131-3/+3
| |/ / | | | | | | | | | | | | When ImageMagick is built with HDRI support, the library names get a HDRI suffix.
* | | Merge topic 'FindTCL-paths-for-8.6'Brad King2013-08-271-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 141ce01 FindTCL: Add BSD paths for Tcl/Tk 8.6
| * | | FindTCL: Add BSD paths for Tcl/Tk 8.6Raphael Kubo da Costa2013-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Follow-up to commit 4a015f77 (OpenBSD: Add paths for Tcl/Tk 8.4/8.5, 2012-12-03): those paths added for OpenBSD also work on other BSDs, some of which are already using version 8.6 of Tcl/Tk.
* | | | Merge topic 'doc-check-flags'Brad King2013-08-262-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 293ecfe CheckC*CompilerFlag: add documentation what to expect from a positive result
| * | | CheckC*CompilerFlag: add documentation what to expect from a positive resultRolf Eike Beer2013-08-132-0/+6
| |/ /
* | | OS X: Do not default to non-existent deployment target SDKBrad King2013-08-141-2/+14
|/ / | | | | | | | | | | | | Since commit 95f78e08 (OS X: Search for SDK based on deployment target, 2013-08-02) we select the default OS X SDK path to match the deployment target. Fix this behavior in the case that the matching SDK does not exist and fall back to the SDK for the current host OS X version.
* | Revert "Add compiler target compile options."Stephen Kelly2013-08-093-7/+0
|/ | | | This reverts commit 2d9ec1dadfdd10043a98d425abb25d0aef117699.
* Merge topic 'wince800'Brad King2013-08-081-1/+5
|\ | | | | | | | | | | 0416a0e VS11: Add support for Windows CE SDKs 8fcf0ab Add support for new Windows CE compiler
| * Add support for new Windows CE compilerPatrick Gansterer2013-08-071-1/+5
| | | | | | | | | | The new compiler versions do not need corelibc.lib as a default link library and a architecture detection workaround.
* | Merge topic 'osx-no-command-line-tools'Brad King2013-08-073-0/+29
|\ \ | |/ |/| | | | | 03ab170 OS X: Enable command-line build without tools in PATH